---

yaml --- r: 362361 b: refs/heads/master c: b193d59 h: refs/heads/master i: 362359: 08f9c02 v: v3
git-mirror · Apr 5, 2013 · 40a3b33 · 40a3b33
1 parent 942dd7b
commit 40a3b33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a58e0be6f6b3eb2079b0b8fedc9df6fa86869f1e
+refs/heads/master: b193d59a4863ea670872d76dc99231ddeb598625
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
@@ -1886,7 +1886,13 @@ int nfs4_discover_server_trunking(struct nfs_client *clp,
 			status = PTR_ERR(clnt);
 			break;
 		}
-		clp->cl_rpcclient = clnt;
+		/* Note: this is safe because we haven't yet marked the
+		 * client as ready, so we are the only user of
+		 * clp->cl_rpcclient
+		 */
+		clnt = xchg(&clp->cl_rpcclient, clnt);
+		rpc_shutdown_client(clnt);
+		clnt = clp->cl_rpcclient;
 		goto again;
 
 	case -NFS4ERR_MINOR_VERS_MISMATCH: