From 488413413f10e5b6cc92abfd667702fcb8a690e9 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 11 Dec 2012 10:31:12 -0500
Subject: [PATCH] --- yaml --- r: 346621 b: refs/heads/master c:
 85563073741bd7935a6900d567ddaf907192270d h: refs/heads/master i:   346619:
 8a074edb69f38e99633001aa28d7bc07ad611912 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/nfs/nfs4proc.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 03f835c09da2..7404a5a71e19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ce0171d4f78992184faed87ea897d730b972965
+refs/heads/master: 85563073741bd7935a6900d567ddaf907192270d
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 92bd799eee01..a4692e97bc19 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -422,6 +422,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
 	struct nfs4_slot *slot;
 	unsigned long timestamp;
 	struct nfs_client *clp;
+	int ret = 1;
 
 	/*
 	 * sr_status remains 1 if an RPC level error occurred. The server
@@ -462,6 +463,16 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
 			slot->slot_nr,
 			slot->seq_nr);
 		goto out_retry;
+	case -NFS4ERR_BADSLOT:
+		/*
+		 * The slot id we used was probably retired. Try again
+		 * using a different slot id.
+		 */
+		if (rpc_restart_call_prepare(task)) {
+			task->tk_status = 0;
+			ret = 0;
+		}
+		break;
 	default:
 		/* Just update the slot sequence no. */
 		++slot->seq_nr;
@@ -470,7 +481,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
 	/* The session may be reset by one of the error handlers. */
 	dprintk("%s: Error %d free the slot \n", __func__, res->sr_status);
 	nfs41_sequence_free_slot(res);
-	return 1;
+	return ret;
 out_retry:
 	if (!rpc_restart_call(task))
 		goto out;