1 files changed, 55 insertions, 39 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 5a70be589bbe..16f57e0af999 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -58,22 +58,19 @@ struct nfs_read_data *nfs_readdata_alloc(unsigned int pagecount)
         return p;
 }
 
-static void nfs_readdata_rcu_free(struct rcu_head *head)
+static void nfs_readdata_free(struct nfs_read_data *p)
 {
-        struct nfs_read_data *p = container_of(head, struct nfs_read_data, task.u.tk_rcu);
         if (p && (p->pagevec != &p->page_array[0]))
                 kfree(p->pagevec);
         mempool_free(p, nfs_rdata_mempool);
 }
 
-static void nfs_readdata_free(struct nfs_read_data *rdata)
-{
-        call_rcu_bh(&rdata->task.u.tk_rcu, nfs_readdata_rcu_free);
-}
-
 void nfs_readdata_release(void *data)
 {
-        nfs_readdata_free(data);
+        struct nfs_read_data *rdata = data;
+
+        put_nfs_open_context(rdata->args.context);
+        nfs_readdata_free(rdata);
 }
 
 static
@@ -156,7 +153,7 @@ static void nfs_readpage_release(struct nfs_page *req)
 /*
  * Set up the NFS read request struct
  */
-static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
+static int nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
                 const struct rpc_call_ops *call_ops,
                 unsigned int count, unsigned int offset)
 {
@@ -174,6 +171,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
                 .rpc_message = &msg,
                 .callback_ops = call_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC | swap_flags,
         };
 
@@ -186,7 +184,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
         data->args.pgbase = req->wb_pgbase + offset;
         data->args.pages  = data->pagevec;
         data->args.count  = count;
-        data->args.context = req->wb_context;
+        data->args.context = get_nfs_open_context(req->wb_context);
 
         data->res.fattr   = &data->fattr;
         data->res.count   = count;
@@ -204,8 +202,10 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
                         (unsigned long long)data->args.offset);
 
         task = rpc_run_task(&task_setup_data);
-        if (!IS_ERR(task))
-                rpc_put_task(task);
+        if (IS_ERR(task))
+                return PTR_ERR(task);
+        rpc_put_task(task);
+        return 0;
 }
 
 static void
@@ -242,6 +242,7 @@ static int nfs_pagein_multi(struct inode *inode, struct list_head *head, unsigne
         size_t rsize = NFS_SERVER(inode)->rsize, nbytes;
         unsigned int offset;
         int requests = 0;
+        int ret = 0;
         LIST_HEAD(list);
 
         nfs_list_remove_request(req);
@@ -253,7 +254,6 @@ static int nfs_pagein_multi(struct inode *inode, struct list_head *head, unsigne
                 data = nfs_readdata_alloc(1);
                 if (!data)
                         goto out_bad;
-                INIT_LIST_HEAD(&data->pages);
                 list_add(&data->pages, &list);
                 requests++;
                 nbytes -= len;
@@ -264,6 +264,8 @@ static int nfs_pagein_multi(struct inode *inode, struct list_head *head, unsigne
         offset = 0;
         nbytes = count;
         do {
+                int ret2;
+
                 data = list_entry(list.next, struct nfs_read_data, pages);
                 list_del_init(&data->pages);
 
@@ -271,13 +273,15 @@ static int nfs_pagein_multi(struct inode *inode, struct list_head *head, unsigne
 
                 if (nbytes < rsize)
                         rsize = nbytes;
-                nfs_read_rpcsetup(req, data, &nfs_read_partial_ops,
+                ret2 = nfs_read_rpcsetup(req, data, &nfs_read_partial_ops,
                                   rsize, offset);
+                if (ret == 0)
+                        ret = ret2;
                 offset += rsize;
                 nbytes -= rsize;
         } while (nbytes != 0);
 
-        return 0;
+        return ret;
 
 out_bad:
         while (!list_empty(&list)) {
@@ -295,12 +299,12 @@ static int nfs_pagein_one(struct inode *inode, struct list_head *head, unsigned
         struct nfs_page         *req;
         struct page             **pages;
         struct nfs_read_data    *data;
+        int ret = -ENOMEM;
 
         data = nfs_readdata_alloc(npages);
         if (!data)
                 goto out_bad;
 
-        INIT_LIST_HEAD(&data->pages);
         pages = data->pagevec;
         while (!list_empty(head)) {
                 req = nfs_list_entry(head->next);
@@ -311,11 +315,10 @@ static int nfs_pagein_one(struct inode *inode, struct list_head *head, unsigned
         }
         req = nfs_list_entry(data->pages.next);
 
-        nfs_read_rpcsetup(req, data, &nfs_read_full_ops, count, 0);
-        return 0;
+        return nfs_read_rpcsetup(req, data, &nfs_read_full_ops, count, 0);
 out_bad:
         nfs_async_read_error(head);
-        return -ENOMEM;
+        return ret;
 }
 
 /*
@@ -342,26 +345,25 @@ int nfs_readpage_result(struct rpc_task *task, struct nfs_read_data *data)
         return 0;
 }
 
-static int nfs_readpage_retry(struct rpc_task *task, struct nfs_read_data *data)
+static void nfs_readpage_retry(struct rpc_task *task, struct nfs_read_data *data)
 {
         struct nfs_readargs *argp = &data->args;
         struct nfs_readres *resp = &data->res;
 
         if (resp->eof || resp->count == argp->count)
-                return 0;
+                return;
 
         /* This is a short read! */
         nfs_inc_stats(data->inode, NFSIOS_SHORTREAD);
         /* Has the server at least made some progress? */
         if (resp->count == 0)
-                return 0;
+                return;
 
         /* Yes, so retry the read at the end of the data */
         argp->offset += resp->count;
         argp->pgbase += resp->count;
         argp->count -= resp->count;
         rpc_restart_call(task);
-        return -EAGAIN;
 }
 
 /*
@@ -370,29 +372,37 @@ static int nfs_readpage_retry(struct rpc_task *task, struct nfs_read_data *data)
 static void nfs_readpage_result_partial(struct rpc_task *task, void *calldata)
 {
         struct nfs_read_data *data = calldata;
-        struct nfs_page *req = data->req;
-        struct page *page = req->wb_page;
  
         if (nfs_readpage_result(task, data) != 0)
                 return;
+        if (task->tk_status < 0)
+                return;
 
-        if (likely(task->tk_status >= 0)) {
-                nfs_readpage_truncate_uninitialised_page(data);
-                if (nfs_readpage_retry(task, data) != 0)
-                        return;
-        }
-        if (unlikely(task->tk_status < 0))
+        nfs_readpage_truncate_uninitialised_page(data);
+        nfs_readpage_retry(task, data);
+}
+
+static void nfs_readpage_release_partial(void *calldata)
+{
+        struct nfs_read_data *data = calldata;
+        struct nfs_page *req = data->req;
+        struct page *page = req->wb_page;
+        int status = data->task.tk_status;
+
+        if (status < 0)
                 SetPageError(page);
+
         if (atomic_dec_and_test(&req->wb_complete)) {
                 if (!PageError(page))
                         SetPageUptodate(page);
                 nfs_readpage_release(req);
         }
+        nfs_readdata_release(calldata);
 }
 
 static const struct rpc_call_ops nfs_read_partial_ops = {
         .rpc_call_done = nfs_readpage_result_partial,
-        .rpc_release = nfs_readdata_release,
+        .rpc_release = nfs_readpage_release_partial,
 };
 
 static void nfs_readpage_set_pages_uptodate(struct nfs_read_data *data)
@@ -427,29 +437,35 @@ static void nfs_readpage_result_full(struct rpc_task *task, void *calldata)
 
         if (nfs_readpage_result(task, data) != 0)
                 return;
+        if (task->tk_status < 0)
+                return;
         /*
          * Note: nfs_readpage_retry may change the values of
          * data->args. In the multi-page case, we therefore need
          * to ensure that we call nfs_readpage_set_pages_uptodate()
          * first.
          */
-        if (likely(task->tk_status >= 0)) {
-                nfs_readpage_truncate_uninitialised_page(data);
-                nfs_readpage_set_pages_uptodate(data);
-                if (nfs_readpage_retry(task, data) != 0)
-                        return;
-        }
+        nfs_readpage_truncate_uninitialised_page(data);
+        nfs_readpage_set_pages_uptodate(data);
+        nfs_readpage_retry(task, data);
+}
+
+static void nfs_readpage_release_full(void *calldata)
+{
+        struct nfs_read_data *data = calldata;
+
         while (!list_empty(&data->pages)) {
                 struct nfs_page *req = nfs_list_entry(data->pages.next);
 
                 nfs_list_remove_request(req);
                 nfs_readpage_release(req);
         }
+        nfs_readdata_release(calldata);
 }
 
 static const struct rpc_call_ops nfs_read_full_ops = {
         .rpc_call_done = nfs_readpage_result_full,
-        .rpc_release = nfs_readdata_release,
+        .rpc_release = nfs_readpage_release_full,
 };
 
 /*