UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd4: minor free_session cleanup 

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-09-11 21:42:40 -04:00
parent e1ff371f9d
commit 1377b69e68
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/nfsd/nfs4state.c
View File

@ -897,20 +897,21 @@ static void nfsd4_del_conns(struct nfsd4_session *s)
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
} }
static void __free_session(struct nfsd4_session *ses)
{
nfsd4_put_drc_mem(slot_bytes(&ses->se_fchannel), ses->se_fchannel.maxreqs);
free_session_slots(ses);
kfree(ses);
}
static void free_session(struct kref *kref) static void free_session(struct kref *kref)
{ {
struct nfsd4_session *ses; struct nfsd4_session *ses;
int mem;
lockdep_assert_held(&client_lock); lockdep_assert_held(&client_lock);
ses = container_of(kref, struct nfsd4_session, se_ref); ses = container_of(kref, struct nfsd4_session, se_ref);
nfsd4_del_conns(ses); nfsd4_del_conns(ses);
spin_lock(&nfsd_drc_lock); __free_session(ses);
mem = ses->se_fchannel.maxreqs * slot_bytes(&ses->se_fchannel);
nfsd_drc_mem_used -= mem;
spin_unlock(&nfsd_drc_lock);
free_session_slots(ses);
kfree(ses);
} }
void nfsd4_put_session(struct nfsd4_session *ses) void nfsd4_put_session(struct nfsd4_session *ses)
@ -966,9 +967,7 @@ static struct nfsd4_session *alloc_init_session(struct svc_rqst *rqstp, struct n
conn = alloc_conn_from_crses(rqstp, cses); conn = alloc_conn_from_crses(rqstp, cses);
if (!conn) { if (!conn) {
spin_lock(&client_lock); __free_session(new);
free_session(&new->se_ref);
spin_unlock(&client_lock);
return NULL; return NULL;
} }
nfsd4_init_conn(rqstp, conn, new); nfsd4_init_conn(rqstp, conn, new);