[PATCH] Streamline generic_file_* interfaces and filemap cleanups

This patch cleans up generic_file_*_read/write() interfaces.  Christoph
Hellwig gave me the idea for this clean ups.

In a nutshell, all filesystems should set .aio_read/.aio_write methods and use
do_sync_read/ do_sync_write() as their .read/.write methods.  This allows us
to cleanup all variants of generic_file_* routines.

Final available interfaces:

generic_file_aio_read() - read handler
generic_file_aio_write() - write handler
generic_file_aio_write_nolock() - no lock write handler

__generic_file_aio_write_nolock() - internal worker routine

Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

24 files changed, 99 insertions, 64 deletions

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 1014b9f2117b..6101ea679cb1 100644
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -27,10 +27,12 @@
 
 const struct file_operations adfs_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
         .mmap           = generic_file_mmap,
         .fsync          = file_fsync,
-        .write          = generic_file_write,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .sendfile       = generic_file_sendfile,
 };
 
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 3de8590e4f6a..05b5e22de759 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -27,8 +27,10 @@ static int affs_file_release(struct inode *inode, struct file *filp);
 
 const struct file_operations affs_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .open           = affs_file_open,
         .release        = affs_file_release,
diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 3d5aca28a0a0..a9164a87f8de 100644
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -19,8 +19,10 @@
 
 const struct file_operations bfs_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .sendfile       = generic_file_sendfile,
 };
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 0f143094ef1d..bc8f27cc4483 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1154,14 +1154,6 @@ static int blkdev_close(struct inode * inode, struct file * filp)
         return blkdev_put(bdev);
 }
 
-static ssize_t blkdev_file_write(struct file *file, const char __user *buf,
-                                   size_t count, loff_t *ppos)
-{
-        struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count };
-
-        return generic_file_write_nolock(file, &local_iov, 1, ppos);
-}
-
 static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
         return blkdev_ioctl(file->f_mapping->host, file, cmd, arg);
@@ -1181,8 +1173,8 @@ const struct file_operations def_blk_fops = {
         .open           = blkdev_open,
         .release        = blkdev_close,
         .llseek         = block_llseek,
-        .read           = generic_file_read,
-        .write          = blkdev_file_write,
+        .read           = do_sync_read,
+        .write          = do_sync_write,
         .aio_read       = generic_file_aio_read,
         .aio_write      = generic_file_aio_write_nolock,
         .mmap           = generic_file_mmap,
diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index e893e2be9ed4..2dba473c524a 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -41,8 +41,8 @@ static int ext2_release_file (struct inode * inode, struct file * filp)
  */
 const struct file_operations ext2_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .write          = do_sync_write,
         .aio_read       = generic_file_aio_read,
         .aio_write      = generic_file_aio_write,
         .ioctl          = ext2_ioctl,
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 5c4fcd1dbf59..183626868eea 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -753,8 +753,10 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
 
 static const struct file_operations fuse_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = fuse_file_mmap,
         .open           = fuse_open,
         .flush          = fuse_flush,
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index d05641c35fc9..02f5573e0349 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -601,8 +601,10 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
 
 static const struct file_operations hfs_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .sendfile       = generic_file_sendfile,
         .fsync          = file_fsync,
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 0eb1a6092668..9e3675249633 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -282,8 +282,10 @@ static struct inode_operations hfsplus_file_inode_operations = {
 
 static const struct file_operations hfsplus_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .sendfile       = generic_file_sendfile,
         .fsync          = file_fsync,
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 4908c38a5885..b6bd33ca3731 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -385,11 +385,11 @@ int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)
 
 static const struct file_operations hostfs_file_fops = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
+        .read           = do_sync_read,
         .sendfile       = generic_file_sendfile,
         .aio_read       = generic_file_aio_read,
         .aio_write      = generic_file_aio_write,
-        .write          = generic_file_write,
+        .write          = do_sync_write,
         .mmap           = generic_file_mmap,
         .open           = hostfs_file_open,
         .release        = NULL,
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index d9eb19b7b8ae..8b94d24855f0 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -113,7 +113,7 @@ static ssize_t hpfs_file_write(struct file *file, const char __user *buf,
 {
         ssize_t retval;
 
-        retval = generic_file_write(file, buf, count, ppos);
+        retval = do_sync_write(file, buf, count, ppos);
         if (retval > 0)
                 hpfs_i(file->f_dentry->d_inode)->i_dirty = 1;
         return retval;
@@ -122,8 +122,10 @@ static ssize_t hpfs_file_write(struct file *file, const char __user *buf,
 const struct file_operations hpfs_file_ops =
 {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
         .write          = hpfs_file_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .release        = hpfs_file_release,
         .fsync          = hpfs_file_fsync,
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index f5cf9c93e243..068ef0de8de2 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -1632,8 +1632,10 @@ static const struct file_operations jffs_file_operations =
 {
         .open           = generic_file_open,
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .ioctl          = jffs_ioctl,
         .mmap           = generic_file_readonly_mmap,
         .fsync          = jffs_fsync,
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 3ed6e3e120b6..242875f77cb3 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -42,8 +42,10 @@ const struct file_operations jffs2_file_operations =
 {
         .llseek =       generic_file_llseek,
         .open =         generic_file_open,
-        .read =         generic_file_read,
-        .write =        generic_file_write,
+        .read =         do_sync_read,
+        .aio_read =     generic_file_aio_read,
+        .write =        do_sync_write,
+        .aio_write =    generic_file_aio_write,
         .ioctl =        jffs2_ioctl,
         .mmap =         generic_file_readonly_mmap,
         .fsync =        jffs2_fsync,
diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index f535f2911c12..976e90dc2d1b 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -103,8 +103,8 @@ struct inode_operations jfs_file_inode_operations = {
 const struct file_operations jfs_file_operations = {
         .open           = jfs_open,
         .llseek         = generic_file_llseek,
-        .write          = generic_file_write,
-        .read           = generic_file_read,
+        .write          = do_sync_write,
+        .read           = do_sync_read,
         .aio_read       = generic_file_aio_read,
         .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
diff --git a/fs/minix/file.c b/fs/minix/file.c
index 420b32882a10..40eac2e60d25 100644
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -17,8 +17,10 @@ int minix_sync_file(struct file *, struct dentry *, int);
 
 const struct file_operations minix_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .fsync          = minix_sync_file,
         .sendfile       = generic_file_sendfile,
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 2f9b5a0953ff..ae2fe0016d2c 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -2296,7 +2296,7 @@ static int ntfs_file_fsync(struct file *filp, struct dentry *dentry,
 
 const struct file_operations ntfs_file_ops = {
         .llseek         = generic_file_llseek,   /* Seek inside file. */
-        .read           = generic_file_read,     /* Read from file. */
+        .read           = do_sync_read,          /* Read from file. */
         .aio_read       = generic_file_aio_read, /* Async read from file. */
 #ifdef NTFS_RW
         .write          = ntfs_file_write,       /* Write to file. */
diff --git a/fs/qnx4/file.c b/fs/qnx4/file.c
index 62af4b1348bd..467e5ac7280e 100644
--- a/fs/qnx4/file.c
+++ b/fs/qnx4/file.c
@@ -22,11 +22,13 @@
 const struct file_operations qnx4_file_operations =
 {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
         .mmap           = generic_file_mmap,
         .sendfile       = generic_file_sendfile,
 #ifdef CONFIG_QNX4FS_RW
-        .write          = generic_file_write,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .fsync          = qnx4_sync_file,
 #endif
 };
diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
index 86f14cacf641..0947fb57dcf3 100644
--- a/fs/ramfs/file-mmu.c
+++ b/fs/ramfs/file-mmu.c
@@ -33,8 +33,10 @@ const struct address_space_operations ramfs_aops = {
 };
 
 const struct file_operations ramfs_file_operations = {
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .fsync          = simple_sync_file,
         .sendfile       = generic_file_sendfile,
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index 677139b48e00..bfe5dbf1002e 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -36,8 +36,10 @@ const struct address_space_operations ramfs_aops = {
 const struct file_operations ramfs_file_operations = {
         .mmap                   = ramfs_nommu_mmap,
         .get_unmapped_area      = ramfs_nommu_get_unmapped_area,
-        .read                   = generic_file_read,
-        .write                  = generic_file_write,
+        .read                   = do_sync_read,
+        .aio_read               = generic_file_aio_read,
+        .write                  = do_sync_write,
+        .aio_write              = generic_file_aio_write,
         .fsync                  = simple_sync_file,
         .sendfile               = generic_file_sendfile,
         .llseek                 = generic_file_llseek,
diff --git a/fs/read_write.c b/fs/read_write.c
index 32d54cca9bd9..4ed839bcb91c 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -22,7 +22,8 @@
 
 const struct file_operations generic_ro_fops = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
         .mmap           = generic_file_readonly_mmap,
         .sendfile       = generic_file_sendfile,
 };
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index dae67048baba..50784d13c87b 100644
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -214,13 +214,15 @@ smb_updatepage(struct file *file, struct page *page, unsigned long offset,
 }
 
 static ssize_t
-smb_file_read(struct file * file, char __user * buf, size_t count, loff_t *ppos)
+smb_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
+                        unsigned long nr_segs, loff_t pos)
 {
+        struct file * file = iocb->ki_filp;
         struct dentry * dentry = file->f_dentry;
         ssize_t status;
 
         VERBOSE("file %s/%s, count=%lu@%lu\n", DENTRY_PATH(dentry),
-                (unsigned long) count, (unsigned long) *ppos);
+                (unsigned long) iocb->ki_left, (unsigned long) pos);
 
         status = smb_revalidate_inode(dentry);
         if (status) {
@@ -233,7 +235,7 @@ smb_file_read(struct file * file, char __user * buf, size_t count, loff_t *ppos)
                 (long)dentry->d_inode->i_size,
                 dentry->d_inode->i_flags, dentry->d_inode->i_atime);
 
-        status = generic_file_read(file, buf, count, ppos);
+        status = generic_file_aio_read(iocb, iov, nr_segs, pos);
 out:
         return status;
 }
@@ -317,14 +319,16 @@ const struct address_space_operations smb_file_aops = {
  * Write to a file (through the page cache).
  */
 static ssize_t
-smb_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+smb_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                               unsigned long nr_segs, loff_t pos)
 {
+        struct file * file = iocb->ki_filp;
         struct dentry * dentry = file->f_dentry;
         ssize_t result;
 
         VERBOSE("file %s/%s, count=%lu@%lu\n",
                 DENTRY_PATH(dentry),
-                (unsigned long) count, (unsigned long) *ppos);
+                (unsigned long) iocb->ki_left, (unsigned long) pos);
 
         result = smb_revalidate_inode(dentry);
         if (result) {
@@ -337,8 +341,8 @@ smb_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
         if (result)
                 goto out;
 
-        if (count > 0) {
-                result = generic_file_write(file, buf, count, ppos);
+        if (iocb->ki_left > 0) {
+                result = generic_file_aio_write(iocb, iov, nr_segs, pos);
                 VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n",
                         (long) file->f_pos, (long) dentry->d_inode->i_size,
                         dentry->d_inode->i_mtime, dentry->d_inode->i_atime);
@@ -402,8 +406,10 @@ smb_file_permission(struct inode *inode, int mask, struct nameidata *nd)
 const struct file_operations smb_file_operations =
 {
         .llseek         = remote_llseek,
-        .read           = smb_file_read,
-        .write          = smb_file_write,
+        .read           = do_sync_read,
+        .aio_read       = smb_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = smb_file_aio_write,
         .ioctl          = smb_ioctl,
         .mmap           = smb_file_mmap,
         .open           = smb_file_open,
diff --git a/fs/sysv/file.c b/fs/sysv/file.c
index a59e303135fa..47a4b728f15b 100644
--- a/fs/sysv/file.c
+++ b/fs/sysv/file.c
@@ -21,8 +21,10 @@
  */
 const struct file_operations sysv_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .fsync          = sysv_sync_file,
         .sendfile       = generic_file_sendfile,
diff --git a/fs/udf/file.c b/fs/udf/file.c
index a59e5f33daf6..7aedd552cba1 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -103,19 +103,21 @@ const struct address_space_operations udf_adinicb_aops = {
         .commit_write           = udf_adinicb_commit_write,
 };
 
-static ssize_t udf_file_write(struct file * file, const char __user * buf,
-        size_t count, loff_t *ppos)
+static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                              unsigned long nr_segs, loff_t ppos)
 {
         ssize_t retval;
+        struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_dentry->d_inode;
         int err, pos;
+        size_t count = iocb->ki_left;
 
         if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB)
         {
                 if (file->f_flags & O_APPEND)
                         pos = inode->i_size;
                 else
-                        pos = *ppos;
+                        pos = ppos;
 
                 if (inode->i_sb->s_blocksize < (udf_file_entry_alloc_offset(inode) +
                         pos + count))
@@ -136,7 +138,7 @@ static ssize_t udf_file_write(struct file * file, const char __user * buf,
                 }
         }
 
-        retval = generic_file_write(file, buf, count, ppos);
+        retval = generic_file_aio_write(iocb, iov, nr_segs, ppos);
 
         if (retval > 0)
                 mark_inode_dirty(inode);
@@ -249,11 +251,13 @@ static int udf_release_file(struct inode * inode, struct file * filp)
 }
 
 const struct file_operations udf_file_operations = {
-        .read                   = generic_file_read,
+        .read                   = do_sync_read,
+        .aio_read               = generic_file_aio_read,
         .ioctl                  = udf_ioctl,
         .open                   = generic_file_open,
         .mmap                   = generic_file_mmap,
-        .write                  = udf_file_write,
+        .write                  = do_sync_write,
+        .aio_write              = udf_file_aio_write,
         .release                = udf_release_file,
         .fsync                  = udf_fsync_file,
         .sendfile               = generic_file_sendfile,
diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index a9c6e5f04fae..1e096323bad4 100644
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -53,8 +53,10 @@ static int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync)
  
 const struct file_operations ufs_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .open           = generic_file_open,
         .fsync          = ufs_sync_file,
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 55992b40353c..fa842f1c9fa2 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -279,7 +279,9 @@ xfs_read(
 
         xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
                                 (void *)iovp, segs, *offset, ioflags);
-        ret = __generic_file_aio_read(iocb, iovp, segs, offset);
+
+        iocb->ki_pos = *offset;
+        ret = generic_file_aio_read(iocb, iovp, segs, *offset);
         if (ret == -EIOCBQUEUED && !(ioflags & IO_ISAIO))
                 ret = wait_on_sync_kiocb(iocb);
         if (ret > 0)