lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd4: fold release_session into expire_client

Browse Source 
and grab the client lock once for all the client's sessions.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Benny Halevy
2010-05-12 00:12:39 +03:00
committed by J. Bruce Fields
parent 9089f1b478
commit be1fdf6c43
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfsd/nfs4state.c
View File

@@ -613,15 +613,6 @@ unhash_session(struct nfsd4_session *ses)
list_del(&ses->se_perclnt); list_del(&ses->se_perclnt);
} }
static void
release_session(struct nfsd4_session *ses)
{
spin_lock(&client_lock);
unhash_session(ses);
spin_unlock(&client_lock);
nfsd4_put_session(ses);
}
void void
free_session(struct kref *kref) free_session(struct kref *kref)
{ {
@@ -722,12 +713,15 @@ expire_client(struct nfs4_client *clp)
sop = list_entry(clp->cl_openowners.next, struct nfs4_stateowner, so_perclient); sop = list_entry(clp->cl_openowners.next, struct nfs4_stateowner, so_perclient);
release_openowner(sop); release_openowner(sop);
} }
spin_lock(&client_lock);
while (!list_empty(&clp->cl_sessions)) { while (!list_empty(&clp->cl_sessions)) {
struct nfsd4_session *ses; struct nfsd4_session *ses;
ses = list_entry(clp->cl_sessions.next, struct nfsd4_session, ses = list_entry(clp->cl_sessions.next, struct nfsd4_session,
se_perclnt); se_perclnt);
release_session(ses); unhash_session(ses);
nfsd4_put_session(ses);
} }
spin_unlock(&client_lock);
nfsd4_set_callback_client(clp, NULL); nfsd4_set_callback_client(clp, NULL);
if (clp->cl_cb_conn.cb_xprt) if (clp->cl_cb_conn.cb_xprt)
svc_xprt_put(clp->cl_cb_conn.cb_xprt); svc_xprt_put(clp->cl_cb_conn.cb_xprt);