UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd4: setclientid remove unnecessary terms from a logical expression 

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-05-18 21:34:55 -04:00
parent d5497fc693
commit e98479b8d6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfsd/nfs4state.c
View File

@ -2344,9 +2344,8 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
nfsd4_probe_callback(conf); nfsd4_probe_callback(conf);
status = nfs_ok; status = nfs_ok;
} }
} else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm))) } else if ((!conf || !same_verf(&conf->cl_confirm, &confirm))
&& (!unconf || (unconf && !same_verf(&unconf->cl_confirm, && (!unconf || !same_verf(&unconf->cl_confirm, &confirm))) {
&confirm)))) {
/* /*
* RFC 3530 14.2.34 CASE 4: * RFC 3530 14.2.34 CASE 4:
* Client probably hasn't noticed that we rebooted yet. * Client probably hasn't noticed that we rebooted yet.