From 7b19500163e6470b5dd70141e58f17a4274683f6 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 31 Jul 2010 14:29:07 -0400
Subject: [PATCH] --- yaml --- r: 206405 b: refs/heads/master c:
 d05dd4e98f0dd30ee933e05ac9363614c47df83a h: refs/heads/master i:   206403:
 601e630eb163a1d4edbd7c3cb79a68c1768ea781 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/internal.h | 7 +++----
 trunk/fs/nfs/nfs4proc.c | 4 +---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8b4dbf99ac2d..32e578291501 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1f88fc7e818c6678c6799a2edb8f1aeccc124aa
+refs/heads/master: d05dd4e98f0dd30ee933e05ac9363614c47df83a
diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h
index d8bd619e386c..699725fee34f 100644
--- a/trunk/fs/nfs/internal.h
+++ b/trunk/fs/nfs/internal.h
@@ -369,10 +369,9 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len)
  * Helper for restarting RPC calls in the possible presence of NFSv4.1
  * sessions.
  */
-static inline void nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
+static inline int nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
 {
 	if (nfs4_has_session(clp))
-		rpc_restart_call_prepare(task);
-	else
-		rpc_restart_call(task);
+		return rpc_restart_call_prepare(task);
+	return rpc_restart_call(task);
 }
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 101bf403f507..7ffbb98ddec3 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -446,9 +446,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
 	nfs41_sequence_free_slot(res);
 	return 1;
 out_retry:
-	rpc_restart_call(task);
-	/* FIXME: rpc_restart_call() should be made to return success/fail */
-	if (task->tk_action == NULL)
+	if (!rpc_restart_call(task))
 		goto out;
 	rpc_delay(task, NFS4_POLL_RETRY_MAX);
 	return 0;