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 c743cdf51ebc2e6dbe6b4f87e71d8821000985f3..7bb4e88f33c74e2946db07e8c644a3d50a8dcd75 100644 (file)
--- 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.