diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-05-18 21:34:55 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-05-31 20:29:58 -0400 |
| commit | e98479b8d6a451bfae1a29e9b2dd503e435f7a48 (patch) | |
| tree | b76bea20badf010097507c47ae8a0c2f5b623b86 /fs/nfsd | |
| parent | d5497fc693a446ce9100fcf4117c3f795ddfd0d2 (diff) | |
| download | blackbird-op-linux-e98479b8d6a451bfae1a29e9b2dd503e435f7a48.tar.gz blackbird-op-linux-e98479b8d6a451bfae1a29e9b2dd503e435f7a48.zip | |
nfsd4: setclientid remove unnecessary terms from a logical expression
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c743cdf51ebc..7bb4e88f33c7 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. |
