Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e98479b8 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: setclientid remove unnecessary terms from a logical expression 



Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent d5497fc6

fs/nfsd/nfs4state.c

+2 −3
Original line number Diff line number Diff line
@@ -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.