From e98479b8d6a451bfae1a29e9b2dd503e435f7a48 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 18 May 2012 21:34:55 -0400 Subject: [PATCH] nfsd4: setclientid remove unnecessary terms from a logical expression Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c743cdf51eb..7bb4e88f33c 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. -- 2.11.4.GIT