diff options
| author | Daniel Rosenberg <drosen@google.com> | 2017-02-24 15:49:45 -0800 |
|---|---|---|
| committer | Arvin Quilao <arquilao@gmail.com> | 2017-03-07 04:06:50 +0000 |
| commit | 0cf5b777512ac9fc6f4a0db9d1f9aab39ea267d7 (patch) | |
| tree | a815e91215f19f4506cc519fd76d4b6bc4e8ab4f | |
| parent | dedd393265187f6ac31e850ac3125bd2a359deaa (diff) | |
ANDROID: sdcardfs: support direct-IO (DIO) operations
This comes from the wrapfs patch
2e346c83b26e Wrapfs: support direct-IO (DIO) operations
Signed-off-by: Li Mengyang <li.mengyang@stonybrook.edu>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 34133558
Change-Id: I3fd779c510ab70d56b1d918f99c20421b524cdc4
| -rwxr-xr-x | fs/sdcardfs/mmap.c | 21 | ||||
| -rwxr-xr-x | fs/sdcardfs/sdcardfs.h | 1 |
2 files changed, 5 insertions, 17 deletions
diff --git a/fs/sdcardfs/mmap.c b/fs/sdcardfs/mmap.c index dd02a11f854..9ec45239107 100755 --- a/fs/sdcardfs/mmap.c +++ b/fs/sdcardfs/mmap.c @@ -86,27 +86,14 @@ static ssize_t sdcardfs_direct_IO(int rw, struct kiocb *iocb, unsigned long nr_segs) { /* - * This function returns zero on purpose in order to support direct IO. - * __dentry_open checks a_ops->direct_IO and returns EINVAL if it is null. - * - * However, this function won't be called by certain file operations - * including generic fs functions. * reads and writes are delivered to - * the lower file systems and the direct IOs will be handled by them. - * - * NOTE: exceptionally, on the recent kernels (since Linux 3.8.x), - * swap_writepage invokes this function directly. + * This function should never be called directly. We need it + * to exist, to get past a check in open_check_o_direct(), + * which is called from do_last(). */ - printk(KERN_INFO "%s, operation is not supported\n", __func__); - return 0; + return -EINVAL; } -/* - * XXX: the default address_space_ops for sdcardfs is empty. We cannot set - * our inode->i_mapping->a_ops to NULL because too many code paths expect - * the a_ops vector to be non-NULL. - */ const struct address_space_operations sdcardfs_aops = { - /* empty on purpose */ .direct_IO = sdcardfs_direct_IO, }; diff --git a/fs/sdcardfs/sdcardfs.h b/fs/sdcardfs/sdcardfs.h index 71d6ff5d456..fe121e81a24 100755 --- a/fs/sdcardfs/sdcardfs.h +++ b/fs/sdcardfs/sdcardfs.h @@ -29,6 +29,7 @@ #include <linux/dcache.h> #include <linux/file.h> #include <linux/fs.h> +#include <linux/aio.h> #include <linux/mm.h> #include <linux/mount.h> #include <linux/namei.h> |