---

yaml --- r: 309860 b: refs/heads/master c: f3d03b9 h: refs/heads/master v: v3
git-mirror · Jun 1, 2012 · 2ea8690 · 2ea8690
1 parent 4d3f594
commit 2ea8690
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8695b90ac3c37278010c76ab3680f35ab358caf9
+refs/heads/master: f3d03b9202e4303f0e687f93ffeab87724f6dcfb
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
@@ -2263,8 +2263,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
 			expire_client(conf);
 		}
 		move_to_confirmed(unconf);
-		conf = unconf;
-		nfsd4_probe_callback(conf);
+		nfsd4_probe_callback(unconf);
 		status = nfs_ok;
 	} else if ((!conf || !same_verf(&conf->cl_confirm, &confirm))
 	    && (!unconf || !same_verf(&unconf->cl_confirm, &confirm))) {