---

yaml --- r: 309855 b: refs/heads/master c: ad72aae h: refs/heads/master i: 309853: d2ad427 309851: 63a54c3 309847: 50debf4 309839: d308f6d 309823: 457727d v: v3
git-mirror · Jun 1, 2012 · 6ed3b05 · 6ed3b05
1 parent 8cfedbf
commit 6ed3b05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63db46328a9854d0adcde69871a28d94e0fc7746
+refs/heads/master: ad72aae5ada1970f423ae7ee0027d0d7eb477597
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
@@ -2212,15 +2212,10 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 		if (new == NULL)
 			goto out;
 		copy_clid(new, conf);
-	} else if (!unconf) {
-		/* case 2: probable client reboot: */
-		new = create_client(clname, dname, rqstp, &clverifier);
-		if (new == NULL)
-			goto out;
-		gen_clid(new);
-	} else {
-		/* case 3: probable client reboot: */
-		expire_client(unconf);
+	} else { /* conf && !same_verf(): */
+		/* cases 2, 3: probable client reboot: */
+		if (unconf)
+			expire_client(unconf);
 		new = create_client(clname, dname, rqstp, &clverifier);
 		if (new == NULL)
 			goto out;