From 6ed3b05cec6be520faa0a6e58a1c44c8bbe7825a Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 18 May 2012 22:00:38 -0400
Subject: [PATCH] --- yaml --- r: 309855 b: refs/heads/master c:
 ad72aae5ada1970f423ae7ee0027d0d7eb477597 h: refs/heads/master i:   309853:
 d2ad4271c24c757ecc085cfd8492700b1c1a889b   309851:
 63a54c38d7066be2a00f72d49d2e0fe4c007e7b3   309847:
 50debf48e799d0aea9e29a405518e5413959d587   309839:
 d308f6d2265323b0792525f5f3f13dd6a5cc4d38   309823:
 457727dc1a50e897f656b3ff19ef17739c06dd16 v: v3

---
 [refs]                    |  2 +-
 trunk/fs/nfsd/nfs4state.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 21ce655df441..a53cb8c43eef 100644
--- 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
index dd4c6d36534b..f62ab7624b1f 100644
--- 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;