From: J. Bruce Fields <bfields@redhat.com>
Date: Sat, 19 May 2012 01:34:55 +0000 (-0400)
Subject: nfsd4: setclientid remove unnecessary terms from a logical expression
X-Git-Tag: upstream/snapshot3+hdmi~7312^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e98479b8d6a451bfae1a29e9b2dd503e435f7a48;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

nfsd4: setclientid remove unnecessary terms from a logical expression

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

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c743cdf..7bb4e88 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2344,9 +2344,8 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
 			nfsd4_probe_callback(conf);
 			status = nfs_ok;
 		}
-	} else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm)))
-	    && (!unconf || (unconf && !same_verf(&unconf->cl_confirm,
-				    				&confirm)))) {
+	} else if ((!conf || !same_verf(&conf->cl_confirm, &confirm))
+	    && (!unconf || !same_verf(&unconf->cl_confirm, &confirm))) {
 		/*
 		 * RFC 3530 14.2.34 CASE 4:
 		 * Client probably hasn't noticed that we rebooted yet.