openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSv4.1: nfs4_destroy_session must call rpc_destroy_waitqueue 

There may still be timers active on the session waitqueues. Make sure
that we kill them before freeing the memory.

Cc: stable@vger.kernel.org # 3.12+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2014-02-01 13:47:06 -05:00
parent 17ead6c85c
commit 20b9a90245
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfs4client.c
View File

@ -170,7 +170,7 @@ void nfs41_shutdown_client(struct nfs_client *clp)
void nfs40_shutdown_client(struct nfs_client *clp) void nfs40_shutdown_client(struct nfs_client *clp)
{ {
if (clp->cl_slot_tbl) { if (clp->cl_slot_tbl) {
nfs4_release_slot_table(clp->cl_slot_tbl); nfs4_shutdown_slot_table(clp->cl_slot_tbl);
kfree(clp->cl_slot_tbl); kfree(clp->cl_slot_tbl);
} }
} }

25
fs/nfs/nfs4session.c
View File

@ -231,14 +231,23 @@ static int nfs4_realloc_slot_table(struct nfs4_slot_table *tbl,
return ret; return ret;
} }
/*
* nfs4_release_slot_table - release all slot table entries
*/
static void nfs4_release_slot_table(struct nfs4_slot_table *tbl)
{
nfs4_shrink_slot_table(tbl, 0);
}
/** /**
* nfs4_release_slot_table - release resources attached to a slot table * nfs4_shutdown_slot_table - release resources attached to a slot table
* @tbl: slot table to shut down * @tbl: slot table to shut down
* *
*/ */
void nfs4_release_slot_table(struct nfs4_slot_table *tbl) void nfs4_shutdown_slot_table(struct nfs4_slot_table *tbl)
{ {
nfs4_shrink_slot_table(tbl, 0); nfs4_release_slot_table(tbl);
rpc_destroy_wait_queue(&tbl->slot_tbl_waitq);
} }
/** /**
@ -422,7 +431,7 @@ void nfs41_update_target_slotid(struct nfs4_slot_table *tbl,
spin_unlock(&tbl->slot_tbl_lock); spin_unlock(&tbl->slot_tbl_lock);
} }
static void nfs4_destroy_session_slot_tables(struct nfs4_session *session) static void nfs4_release_session_slot_tables(struct nfs4_session *session)
{ {
nfs4_release_slot_table(&session->fc_slot_table); nfs4_release_slot_table(&session->fc_slot_table);
nfs4_release_slot_table(&session->bc_slot_table); nfs4_release_slot_table(&session->bc_slot_table);
@ -450,7 +459,7 @@ int nfs4_setup_session_slot_tables(struct nfs4_session *ses)
if (status && tbl->slots == NULL) if (status && tbl->slots == NULL)
/* Fore and back channel share a connection so get /* Fore and back channel share a connection so get
* both slot tables or neither */ * both slot tables or neither */
nfs4_destroy_session_slot_tables(ses); nfs4_release_session_slot_tables(ses);
return status; return status;
} }
@ -470,6 +479,12 @@ struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp)
return session; return session;
} }
static void nfs4_destroy_session_slot_tables(struct nfs4_session *session)
{
nfs4_shutdown_slot_table(&session->fc_slot_table);
nfs4_shutdown_slot_table(&session->bc_slot_table);
}
void nfs4_destroy_session(struct nfs4_session *session) void nfs4_destroy_session(struct nfs4_session *session)
{ {
struct rpc_xprt *xprt; struct rpc_xprt *xprt;

2
fs/nfs/nfs4session.h
View File

@ -74,7 +74,7 @@ enum nfs4_session_state {
extern int nfs4_setup_slot_table(struct nfs4_slot_table *tbl, extern int nfs4_setup_slot_table(struct nfs4_slot_table *tbl,
unsigned int max_reqs, const char *queue); unsigned int max_reqs, const char *queue);
extern void nfs4_release_slot_table(struct nfs4_slot_table *tbl); extern void nfs4_shutdown_slot_table(struct nfs4_slot_table *tbl);
extern struct nfs4_slot *nfs4_alloc_slot(struct nfs4_slot_table *tbl); extern struct nfs4_slot *nfs4_alloc_slot(struct nfs4_slot_table *tbl);
extern void nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot); extern void nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot);
extern void nfs4_slot_tbl_drain_complete(struct nfs4_slot_table *tbl); extern void nfs4_slot_tbl_drain_complete(struct nfs4_slot_table *tbl);