diff options
author | Yanchuan Nian <ycnian@gmail.com> | 2012-12-24 05:11:45 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2013-01-23 18:17:37 -0500 |
commit | 266533c6df7a4a4e2ebd0bfdd272f7eb7cf4b81f (patch) | |
tree | f27e090dcc4adb1a95857d7f0b5e94f51ddef08b /fs/nfsd | |
parent | 74b70dded311fa0e6e7529514b29bbb8e6bb1f3e (diff) |
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/nfsd')
-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 29924a04cf3d..cc41bf4bcab2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -1844,11 +1844,12 @@ nfsd4_create_session(struct svc_rqst *rqstp, | |||
1844 | 1844 | ||
1845 | /* cache solo and embedded create sessions under the state lock */ | 1845 | /* cache solo and embedded create sessions under the state lock */ |
1846 | nfsd4_cache_create_session(cr_ses, cs_slot, status); | 1846 | nfsd4_cache_create_session(cr_ses, cs_slot, status); |
1847 | out: | ||
1848 | nfs4_unlock_state(); | 1847 | nfs4_unlock_state(); |
1848 | out: | ||
1849 | dprintk("%s returns %d\n", __func__, ntohl(status)); | 1849 | dprintk("%s returns %d\n", __func__, ntohl(status)); |
1850 | return status; | 1850 | return status; |
1851 | out_free_conn: | 1851 | out_free_conn: |
1852 | nfs4_unlock_state(); | ||
1852 | free_conn(conn); | 1853 | free_conn(conn); |
1853 | out_free_session: | 1854 | out_free_session: |
1854 | __free_session(new); | 1855 | __free_session(new); |