diff options
| author | Yanchuan Nian <ycnian@gmail.com> | 2012-12-24 18:11:45 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-01-23 18:17:37 -0500 |
| commit | 266533c6df7a4a4e2ebd0bfdd272f7eb7cf4b81f (patch) | |
| tree | f27e090dcc4adb1a95857d7f0b5e94f51ddef08b /fs | |
| parent | 74b70dded311fa0e6e7529514b29bbb8e6bb1f3e (diff) | |
| download | op-kernel-dev-266533c6df7a4a4e2ebd0bfdd272f7eb7cf4b81f.zip op-kernel-dev-266533c6df7a4a4e2ebd0bfdd272f7eb7cf4b81f.tar.gz | |
nfsd: Don't unlock the state while it's not locked
In the procedure of CREATE_SESSION, the state is locked after
alloc_conn_from_crses(). If the allocation fails, the function
goes to "out_free_session", and then "out" where there is an
unlock function.
Signed-off-by: Yanchuan Nian <ycnian@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 29924a0..cc41bf4 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1844,11 +1844,12 @@ nfsd4_create_session(struct svc_rqst *rqstp, /* cache solo and embedded create sessions under the state lock */ nfsd4_cache_create_session(cr_ses, cs_slot, status); -out: nfs4_unlock_state(); +out: dprintk("%s returns %d\n", __func__, ntohl(status)); return status; out_free_conn: + nfs4_unlock_state(); free_conn(conn); out_free_session: __free_session(new); |
