From: J. Bruce Fields <bfields@redhat.com>
Date: Sat, 19 May 2012 02:00:38 +0000 (-0400)
Subject: nfsd4: merge last two setclientid cases
X-Git-Tag: accepted/tizen/common/20141203.182822~4459^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad72aae5ada1970f423ae7ee0027d0d7eb477597;p=platform%2Fkernel%2Flinux-arm64.git

nfsd4: merge last two setclientid cases

The code here is mostly the same.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index dd4c6d3..f62ab76 100644
--- a/fs/nfsd/nfs4state.c
+++ b/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;