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

Commit 31f4a6c1 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] knfsd: nfsd4: fix uncomfirmed list 



Setclientid code assumes there is only one match in unconfirmed list.
Make sure that assumption holds.

From: Fred Isaman
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fd39ca9a

fs/nfsd/nfs4state.c

+7 −4
Original line number Diff line number Diff line
@@ -743,9 +743,12 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) 
		 * nfs4_client,  but with the new callback info and a 

		 * new cl_confirm

		 */

		if ((unconf) && 

		    cmp_verf(&unconf->cl_verifier, &conf->cl_verifier) &&

		     cmp_clid(&unconf->cl_clientid, &conf->cl_clientid)) {

		if (unconf) {

			/* Note this is removing unconfirmed {*x***},

			 * which is stronger than RFC recommended {vxc**}.

			 * This has the advantage that there is at most

			 * one {*x***} in either list at any time.

			 */

			expire_client(unconf);

		}

		new = create_client(clname, dname);