提交 84d38ac9 编写于 作者: B Benny Halevy 提交者: J. Bruce Fields

nfsd4: refactor expire_client

Separate out unhashing of the client and session.
To be used later by the laundromat.
Signed-off-by: NBenny Halevy <bhalevy@panasas.com>
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
上级 36acb66b
...@@ -693,6 +693,20 @@ free_client(struct nfs4_client *clp) ...@@ -693,6 +693,20 @@ free_client(struct nfs4_client *clp)
kfree(clp); kfree(clp);
} }
/* must be called under the client_lock */
static inline void
unhash_client_locked(struct nfs4_client *clp)
{
list_del(&clp->cl_lru);
while (!list_empty(&clp->cl_sessions)) {
struct nfsd4_session *ses;
ses = list_entry(clp->cl_sessions.next, struct nfsd4_session,
se_perclnt);
unhash_session(ses);
nfsd4_put_session(ses);
}
}
static void static void
expire_client(struct nfs4_client *clp) expire_client(struct nfs4_client *clp)
{ {
...@@ -719,21 +733,14 @@ expire_client(struct nfs4_client *clp) ...@@ -719,21 +733,14 @@ 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);
} }
nfsd4_set_callback_client(clp, NULL);
if (clp->cl_cb_conn.cb_xprt)
svc_xprt_put(clp->cl_cb_conn.cb_xprt);
list_del(&clp->cl_idhash); list_del(&clp->cl_idhash);
list_del(&clp->cl_strhash); list_del(&clp->cl_strhash);
spin_lock(&client_lock); spin_lock(&client_lock);
list_del(&clp->cl_lru); unhash_client_locked(clp);
while (!list_empty(&clp->cl_sessions)) {
struct nfsd4_session *ses;
ses = list_entry(clp->cl_sessions.next, struct nfsd4_session,
se_perclnt);
unhash_session(ses);
nfsd4_put_session(ses);
}
spin_unlock(&client_lock); spin_unlock(&client_lock);
nfsd4_set_callback_client(clp, NULL);
if (clp->cl_cb_conn.cb_xprt)
svc_xprt_put(clp->cl_cb_conn.cb_xprt);
free_client(clp); free_client(clp);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册