7 files changed, 19 insertions, 34 deletions

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index ab12913dd473..c1a1bd8ddf1c 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -457,13 +457,3 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len)
                 PAGE_SIZE - 1) >> PAGE_SHIFT;
 }
 
-/*
- * Helper for restarting RPC calls in the possible presence of NFSv4.1
- * sessions.
- */
-static inline int nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
-{
-        if (nfs4_has_session(clp))
-                return rpc_restart_call_prepare(task);
-        return rpc_restart_call(task);
-}
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 4c78c62639e6..09119418402f 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -122,7 +122,6 @@ static int filelayout_async_handle_error(struct rpc_task *task,
 static int filelayout_read_done_cb(struct rpc_task *task,
                                 struct nfs_read_data *data)
 {
-        struct nfs_client *clp = data->ds_clp;
         int reset = 0;
 
         dprintk("%s DS read\n", __func__);
@@ -134,9 +133,8 @@ static int filelayout_read_done_cb(struct rpc_task *task,
                 if (reset) {
                         pnfs_set_lo_fail(data->lseg);
                         nfs4_reset_read(task, data);
-                        clp = NFS_SERVER(data->inode)->nfs_client;
                 }
-                nfs_restart_rpc(task, clp);
+                rpc_restart_call_prepare(task);
                 return -EAGAIN;
         }
 
@@ -203,17 +201,13 @@ static int filelayout_write_done_cb(struct rpc_task *task,
 
         if (filelayout_async_handle_error(task, data->args.context->state,
                                           data->ds_clp, &reset) == -EAGAIN) {
-                struct nfs_client *clp;
-
                 dprintk("%s calling restart ds_clp %p ds_clp->cl_session %p\n",
                         __func__, data->ds_clp, data->ds_clp->cl_session);
                 if (reset) {
                         pnfs_set_lo_fail(data->lseg);
                         nfs4_reset_write(task, data);
-                        clp = NFS_SERVER(data->inode)->nfs_client;
-                } else
-                        clp = data->ds_clp;
-                nfs_restart_rpc(task, clp);
+                }
+                rpc_restart_call_prepare(task);
                 return -EAGAIN;
         }
 
@@ -245,7 +239,7 @@ static int filelayout_commit_done_cb(struct rpc_task *task,
                         prepare_to_resend_writes(data);
                         pnfs_set_lo_fail(data->lseg);
                 } else
-                        nfs_restart_rpc(task, data->ds_clp);
+                        rpc_restart_call_prepare(task);
                 return -EAGAIN;
         }
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ba0da50865fe..d2ae413c986a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3191,7 +3191,7 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_read_data *data)
         struct nfs_server *server = NFS_SERVER(data->inode);
 
         if (nfs4_async_handle_error(task, server, data->args.context->state) == -EAGAIN) {
-                nfs_restart_rpc(task, server->nfs_client);
+                rpc_restart_call_prepare(task);
                 return -EAGAIN;
         }
 
@@ -3241,7 +3241,7 @@ static int nfs4_write_done_cb(struct rpc_task *task, struct nfs_write_data *data
         struct inode *inode = data->inode;
         
         if (nfs4_async_handle_error(task, NFS_SERVER(inode), data->args.context->state) == -EAGAIN) {
-                nfs_restart_rpc(task, NFS_SERVER(inode)->nfs_client);
+                rpc_restart_call_prepare(task);
                 return -EAGAIN;
         }
         if (task->tk_status >= 0) {
@@ -3298,7 +3298,7 @@ static int nfs4_commit_done_cb(struct rpc_task *task, struct nfs_write_data *dat
         struct inode *inode = data->inode;
 
         if (nfs4_async_handle_error(task, NFS_SERVER(inode), NULL) == -EAGAIN) {
-                nfs_restart_rpc(task, NFS_SERVER(inode)->nfs_client);
+                rpc_restart_call_prepare(task);
                 return -EAGAIN;
         }
         nfs_refresh_inode(inode, data->res.fattr);
@@ -3838,7 +3838,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
         default:
                 if (nfs4_async_handle_error(task, data->res.server, NULL) ==
                                 -EAGAIN) {
-                        nfs_restart_rpc(task, data->res.server->nfs_client);
+                        rpc_restart_call_prepare(task);
                         return;
                 }
         }
@@ -4092,8 +4092,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
                         break;
                 default:
                         if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN)
-                                nfs_restart_rpc(task,
-                                                 calldata->server->nfs_client);
+                                rpc_restart_call_prepare(task);
         }
 }
 
@@ -4926,7 +4925,7 @@ static void nfs4_get_lease_time_done(struct rpc_task *task, void *calldata)
                 task->tk_status = 0;
                 /* fall through */
         case -NFS4ERR_RETRY_UNCACHED_REP:
-                nfs_restart_rpc(task, data->clp);
+                rpc_restart_call_prepare(task);
                 return;
         }
         dprintk("<-- %s\n", __func__);
@@ -5767,7 +5766,7 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)
 
         server = NFS_SERVER(lrp->args.inode);
         if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN) {
-                nfs_restart_rpc(task, lrp->clp);
+                rpc_restart_call_prepare(task);
                 return;
         }
         spin_lock(&lo->plh_inode->i_lock);
@@ -5938,7 +5937,7 @@ nfs4_layoutcommit_done(struct rpc_task *task, void *calldata)
         }
 
         if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN) {
-                nfs_restart_rpc(task, server->nfs_client);
+                rpc_restart_call_prepare(task);
                 return;
         }
 
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index bfc20b160243..e866a7e6e2d5 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -435,7 +435,7 @@ static void nfs_readpage_retry(struct rpc_task *task, struct nfs_read_data *data
         argp->offset += resp->count;
         argp->pgbase += resp->count;
         argp->count -= resp->count;
-        nfs_restart_rpc(task, NFS_SERVER(data->inode)->nfs_client);
+        rpc_restart_call_prepare(task);
 }
 
 /*
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index b2fbbde58e44..4f9319a2e567 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -87,7 +87,7 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
         struct inode *dir = data->dir;
 
         if (!NFS_PROTO(dir)->unlink_done(task, dir))
-                nfs_restart_rpc(task, NFS_SERVER(dir)->nfs_client);
+                rpc_restart_call_prepare(task);
 }
 
 /**
@@ -369,7 +369,7 @@ static void nfs_async_rename_done(struct rpc_task *task, void *calldata)
         struct dentry *new_dentry = data->new_dentry;
 
         if (!NFS_PROTO(old_dir)->rename_done(task, old_dir, new_dir)) {
-                nfs_restart_rpc(task, NFS_SERVER(old_dir)->nfs_client);
+                rpc_restart_call_prepare(task);
                 return;
         }
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 2084a6494218..ad90b0c998cb 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1305,7 +1305,7 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
                                  */
                                 argp->stable = NFS_FILE_SYNC;
                         }
-                        nfs_restart_rpc(task, server->nfs_client);
+                        rpc_restart_call_prepare(task);
                         return;
                 }
                 if (time_before(complain, jiffies)) {
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index c5347d29cfb7..f0268ea7e711 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -850,7 +850,9 @@ rpc_restart_call_prepare(struct rpc_task *task)
 {
         if (RPC_ASSASSINATED(task))
                 return 0;
-        task->tk_action = rpc_prepare_task;
+        task->tk_action = call_start;
+        if (task->tk_ops->rpc_call_prepare != NULL)
+                task->tk_action = rpc_prepare_task;
         return 1;
 }
 EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);