diff options
| author | Carsten Otte <cotte@de.ibm.com> | 2005-06-23 22:05:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:06:41 -0700 |
| commit | ceffc078528befc008c6f2c2c4decda79eabd534 (patch) | |
| tree | a289e10162bdef0c0d9f6533f1a647b0fe1ed7a9 /fs | |
| parent | 420edbcc09008342c7b2665453f6b370739aadb0 (diff) | |
| download | linux-3.10-ceffc078528befc008c6f2c2c4decda79eabd534.tar.gz linux-3.10-ceffc078528befc008c6f2c2c4decda79eabd534.tar.bz2 linux-3.10-ceffc078528befc008c6f2c2c4decda79eabd534.zip | |
[PATCH] xip: fs/mm: execute in place
- generic_file* file operations do no longer have a xip/non-xip split
- filemap_xip.c implements a new set of fops that require get_xip_page
aop to work proper. all new fops are exported GPL-only (don't like to
see whatever code use those except GPL modules)
- __xip_unmap now uses page_check_address, which is no longer static
in rmap.c, and defined in linux/rmap.h
- mm/filemap.h is now much more clean, plainly having just Linus'
inline funcs moved here from filemap.c
- fix includes in filemap_xip to make it build cleanly on i386
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/open.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index 8ec63f73591..3f4a4286fdc 100644 --- a/fs/open.c +++ b/fs/open.c @@ -808,7 +808,9 @@ struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags) /* NB: we're sure to have correct a_ops only after f_op->open */ if (f->f_flags & O_DIRECT) { - if (!f->f_mapping->a_ops || !f->f_mapping->a_ops->direct_IO) { + if (!f->f_mapping->a_ops || + ((!f->f_mapping->a_ops->direct_IO) && + (!f->f_mapping->a_ops->get_xip_page))) { fput(f); f = ERR_PTR(-EINVAL); } |