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

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

nfsd4: kill unneeded cl_confirm check 



We generate a unique cl_confirm for every new client; so if we've
already checked that this cl_confirm agrees with the cl_confirm of
unconf, then we already know that it does not agree with the cl_confirm
of conf.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent f3aba4e5

fs/nfsd/nfs4state.c

+1 −3
Original line number Diff line number Diff line
@@ -835,9 +835,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, 
	 * SETCLIENTID_CONFIRM request processing consisting

	 * of 4 bullet points, labeled as CASE1 - CASE4 below.

	 */

	if ((conf && unconf) && 

	    (same_verf(&unconf->cl_confirm, &confirm)) &&

	    (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {

	if (conf && unconf && same_verf(&confirm, &unconf->cl_confirm)) {

		/*

		 * RFC 3530 14.2.34 CASE 1:

		 * callback update