Commit 20b9a902 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 17ead6c8

fs/nfs/nfs4client.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void nfs41_shutdown_client(struct nfs_client *clp) 
void nfs40_shutdown_client(struct nfs_client *clp)

{

	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);

	}

}

fs/nfs/nfs4session.c

+20 −5
Original line number Diff line number Diff line
@@ -231,14 +231,23 @@ out: 
	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

 *

 */

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);

}



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->bc_slot_table);
@@ -450,7 +459,7 @@ int nfs4_setup_session_slot_tables(struct nfs4_session *ses) 
	if (status && tbl->slots == NULL)

		/* Fore and back channel share a connection so get

		 * both slot tables or neither */

		nfs4_destroy_session_slot_tables(ses);

		nfs4_release_session_slot_tables(ses);

	return status;

}
@@ -470,6 +479,12 @@ struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp) 
	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)

{

	struct rpc_xprt *xprt;

fs/nfs/nfs4session.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ enum nfs4_session_state { 


extern int nfs4_setup_slot_table(struct nfs4_slot_table *tbl,

		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 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);