From: Neil Brown Date: Tue, 13 Sep 2005 08:25:39 +0000 (-0700) Subject: [PATCH] nfsd4: fix setclientid unlock of unlocked state lock X-Git-Tag: v2.6.14-rc2~66 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73aea4ecd38ebeff9e322f738057f4ae2c32a3ee;p=linux-2.6 [PATCH] nfsd4: fix setclientid unlock of unlocked state lock We could try to unlock the state lock here without having first locked it. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ec2fdb009b..6bbefd06f1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -678,13 +678,12 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) int status; char dname[HEXDIR_LEN]; - status = nfserr_inval; if (!check_name(clname)) - goto out; + return nfserr_inval; status = nfs4_make_rec_clidname(dname, &clname); if (status) - goto out; + return status; /* * XXX The Duplicate Request Cache (DRC) has been checked (??)