From 3c4f3e1135fa80a1521be845b2f9e0023f87d0a9 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 27 May 2012 13:47:21 -0400
Subject: [PATCH] --- yaml --- r: 308673 b: refs/heads/master c:
 43ac544cb36adf38338c01968f8e3a5f81b7d629 h: refs/heads/master i:   308671:
 587b31a45af729a207a2dec86234d2e51e4812a5 v: v3

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

diff --git a/[refs] b/[refs]
index d94963ec8048..587b7e2440ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32b0131069c5bebf52368a9fe170f8d58b78fa8d
+refs/heads/master: 43ac544cb36adf38338c01968f8e3a5f81b7d629
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
index 7dbca666283a..d21ed0309601 100644
--- a/trunk/fs/nfs/nfs4state.c
+++ b/trunk/fs/nfs/nfs4state.c
@@ -1782,10 +1782,12 @@ static int nfs4_bind_conn_to_session(struct nfs_client *clp)
 	struct rpc_cred *cred;
 	int ret;
 
+	nfs4_begin_drain_session(clp);
 	cred = nfs4_get_exchange_id_cred(clp);
 	ret = nfs4_proc_bind_conn_to_session(clp, cred);
 	if (cred)
 		put_rpccred(cred);
+	clear_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state);
 	return ret;
 }
 #else /* CONFIG_NFS_V4_1 */