summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-09-13 01:25:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 08:22:32 -0700
commit73aea4ecd38ebeff9e322f738057f4ae2c32a3ee (patch)
treecabc00b17b3f96854cd818ea7e26734ac855843c /fs/nfsd
parentb59e3c0e172e3f3a147021aa16b929482b8d5846 (diff)
downloadop-kernel-dev-73aea4ecd38ebeff9e322f738057f4ae2c32a3ee.zip
op-kernel-dev-73aea4ecd38ebeff9e322f738057f4ae2c32a3ee.tar.gz
[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/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index ec2fdb0..6bbefd0 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 (??)
OpenPOWER on IntegriCloud