From 81d53278e66c5426bdf2eb956aa50b8ae3791d40 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 27 May 2012 12:58:48 -0400
Subject: [PATCH] --- yaml --- r: 308675 b: refs/heads/master c:
 7c5d7256845e30d295de4d72d4c52943bff7d1ac h: refs/heads/master i:   308673:
 3c4f3e1135fa80a1521be845b2f9e0023f87d0a9   308671:
 587b31a45af729a207a2dec86234d2e51e4812a5 v: v3

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

diff --git a/[refs] b/[refs]
index 3f21e55bbce6..05afc8448d5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf674c8228710fa4149df3988862dc112860df99
+refs/heads/master: 7c5d7256845e30d295de4d72d4c52943bff7d1ac
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
index d685fd4294fb..e593ae972567 100644
--- a/trunk/fs/nfs/nfs4state.c
+++ b/trunk/fs/nfs/nfs4state.c
@@ -1493,12 +1493,14 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error)
 		case -NFS4ERR_BADSLOT:
 		case -NFS4ERR_BAD_HIGH_SLOT:
 		case -NFS4ERR_DEADSESSION:
-		case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
 		case -NFS4ERR_SEQ_FALSE_RETRY:
 		case -NFS4ERR_SEQ_MISORDERED:
 			set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);
 			/* Zero session reset errors */
 			break;
+		case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
+			set_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state);
+			break;
 		case -EKEYEXPIRED:
 			/* Nothing we can do */
 			nfs4_warn_keyexpired(clp->cl_hostname);