diff options
author | Neil Brown <neilb@suse.de> | 2005-09-13 10:25:39 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 17:22:32 +0200 |
commit | 73aea4ecd38ebeff9e322f738057f4ae2c32a3ee (patch) | |
tree | cabc00b17b3f96854cd818ea7e26734ac855843c /fs | |
parent | [PATCH] nfsd4: fix open seqid incrementing in lock (diff) | |
download | linux-73aea4ecd38ebeff9e322f738057f4ae2c32a3ee.tar.xz linux-73aea4ecd38ebeff9e322f738057f4ae2c32a3ee.zip |
[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 <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfs4state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ec2fdb009bf1..6bbefd06f10d 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 (??) |