[PATCH] Vectorize aio_read/aio_write fileop methods

This patch vectorizes aio_read() and aio_write() methods to prepare for
collapsing all aio & vectored operations into one interface - which is
aio_read()/aio_write().

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

1 files changed, 16 insertions, 4 deletions

diff --git a/fs/read_write.c b/fs/read_write.c
index d4cb3183c99c..679dd535380f 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -227,14 +227,20 @@ static void wait_on_retry_sync_kiocb(struct kiocb *iocb)
 
 ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
 {
+        struct iovec iov = { .iov_base = buf, .iov_len = len };
         struct kiocb kiocb;
         ssize_t ret;
 
         init_sync_kiocb(&kiocb, filp);
         kiocb.ki_pos = *ppos;
-        while (-EIOCBRETRY ==
-                (ret = filp->f_op->aio_read(&kiocb, buf, len, kiocb.ki_pos)))
+        kiocb.ki_left = len;
+
+        for (;;) {
+                ret = filp->f_op->aio_read(&kiocb, &iov, 1, kiocb.ki_pos);
+                if (ret != -EIOCBRETRY)
+                        break;
                 wait_on_retry_sync_kiocb(&kiocb);
+        }
 
         if (-EIOCBQUEUED == ret)
                 ret = wait_on_sync_kiocb(&kiocb);
@@ -279,14 +285,20 @@ EXPORT_SYMBOL(vfs_read);
 
 ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
 {
+        struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
         struct kiocb kiocb;
         ssize_t ret;
 
         init_sync_kiocb(&kiocb, filp);
         kiocb.ki_pos = *ppos;
-        while (-EIOCBRETRY ==
-               (ret = filp->f_op->aio_write(&kiocb, buf, len, kiocb.ki_pos)))
+        kiocb.ki_left = len;
+
+        for (;;) {
+                ret = filp->f_op->aio_write(&kiocb, &iov, 1, kiocb.ki_pos);
+                if (ret != -EIOCBRETRY)
+                        break;
                 wait_on_retry_sync_kiocb(&kiocb);
+        }
 
         if (-EIOCBQUEUED == ret)
                 ret = wait_on_sync_kiocb(&kiocb);