[PATCH] Vectorize aio_read/aio_write fileop methods

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / aio.c

diff --git a/fs/aio.c b/fs/aio.c
index 5a28b69ad223b243121c8eb65495f9a519891d33..27ff56540c731c8389c81428f40049e1a493539c 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -15,6 +15,7 @@
 #include <linux/aio_abi.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/uio.h>
 
 #define DEBUG 0
 
@@ -29,7 +30,6 @@
 #include <linux/highmem.h>
 #include <linux/workqueue.h>
 #include <linux/security.h>
-#include <linux/rcuref.h>
 
 #include <asm/kmap_types.h>
 #include <asm/uaccess.h>
@@ -123,10 +123,9 @@ static int aio_setup_ring(struct kioctx *ctx)
        info->nr = 0;
        info->ring_pages = info->internal_pages;
        if (nr_pages > AIO_RING_PAGES) {
-               info->ring_pages = kmalloc(sizeof(struct page *) * nr_pages, GFP_KERNEL);
+               info->ring_pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL);
                if (!info->ring_pages)
                        return -ENOMEM;
-               memset(info->ring_pages, 0, sizeof(struct page *) * nr_pages);
        }
 
        info->mmap_size = nr_pages * PAGE_SIZE;
@@ -514,7 +513,7 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
        /* Must be done under the lock to serialise against cancellation.
         * Call this aio_fput as it duplicates fput via the fput_work.
         */
-       if (unlikely(rcuref_dec_and_test(&req->ki_filp->f_count))) {
+       if (unlikely(atomic_dec_and_test(&req->ki_filp->f_count))) {
                get_ioctx(ctx);
                spin_lock(&fput_lock);
                list_add(&req->ki_list, &fput_head);
@@ -643,7 +642,7 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb)
  *     invoked both for initial i/o submission and
  *     subsequent retries via the aio_kick_handler.
  *     Expects to be invoked with iocb->ki_ctx->lock
- *     already held. The lock is released and reaquired
+ *     already held. The lock is released and reacquired
  *     as needed during processing.
  *
  * Calls the iocb retry method (already setup for the
@@ -779,11 +778,11 @@ out:
 static int __aio_run_iocbs(struct kioctx *ctx)
 {
        struct kiocb *iocb;
-       LIST_HEAD(run_list);
+       struct list_head run_list;
 
        assert_spin_locked(&ctx->ctx_lock);
 
-       list_splice_init(&ctx->run_list, &run_list);
+       list_replace_init(&ctx->run_list, &run_list);
        while (!list_empty(&run_list)) {
                iocb = list_entry(run_list.next, struct kiocb,
                        ki_run_list);
@@ -1317,8 +1316,11 @@ static ssize_t aio_pread(struct kiocb *iocb)
        ssize_t ret = 0;
 
        do {
-               ret = file->f_op->aio_read(iocb, iocb->ki_buf,
-                       iocb->ki_left, iocb->ki_pos);
+               iocb->ki_inline_vec.iov_base = iocb->ki_buf;
+               iocb->ki_inline_vec.iov_len = iocb->ki_left;
+
+               ret = file->f_op->aio_read(iocb, &iocb->ki_inline_vec,
+                                               1, iocb->ki_pos);
                /*
                 * Can't just depend on iocb->ki_left to determine
                 * whether we are done. This may have been a short read.
@@ -1351,8 +1353,11 @@ static ssize_t aio_pwrite(struct kiocb *iocb)
        ssize_t ret = 0;
 
        do {
-               ret = file->f_op->aio_write(iocb, iocb->ki_buf,
-                       iocb->ki_left, iocb->ki_pos);
+               iocb->ki_inline_vec.iov_base = iocb->ki_buf;
+               iocb->ki_inline_vec.iov_len = iocb->ki_left;
+
+               ret = file->f_op->aio_write(iocb, &iocb->ki_inline_vec,
+                                               1, iocb->ki_pos);
                if (ret > 0) {
                        iocb->ki_buf += ret;
                        iocb->ki_left -= ret;