Commit eb2a1cd3 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Add global helper for releasing slot table resources 



The nfs4_destroy_slot_tables() function is renamed to avoid
confusion with the new helper.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 744aa525

fs/nfs/nfs4session.c

+15 −6
Original line number Diff line number Diff line
@@ -231,6 +231,16 @@ static int nfs4_realloc_slot_table(struct nfs4_slot_table *tbl, 
	return ret;

}



/**

 * nfs4_release_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)

{

	nfs4_shrink_slot_table(tbl, 0);

}



/**

 * nfs4_setup_slot_table - prepare a stand-alone slot table for use

 * @tbl: slot table to set up
@@ -412,11 +422,10 @@ void nfs41_update_target_slotid(struct nfs4_slot_table *tbl, 


#if defined(CONFIG_NFS_V4_1)



/* Destroy the slot table */

static void nfs4_destroy_slot_tables(struct nfs4_session *session)

static void nfs4_destroy_session_slot_tables(struct nfs4_session *session)

{

	nfs4_shrink_slot_table(&session->fc_slot_table, 0);

	nfs4_shrink_slot_table(&session->bc_slot_table, 0);

	nfs4_release_slot_table(&session->fc_slot_table);

	nfs4_release_slot_table(&session->bc_slot_table);

}



/*
@@ -441,7 +450,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_slot_tables(ses);

		nfs4_destroy_session_slot_tables(ses);

	return status;

}
@@ -477,7 +486,7 @@ void nfs4_destroy_session(struct nfs4_session *session) 
	dprintk("%s Destroy backchannel for xprt %p\n",

		__func__, xprt);

	xprt_destroy_backchannel(xprt, NFS41_BC_MIN_CALLBACKS);

	nfs4_destroy_slot_tables(session);

	nfs4_destroy_session_slot_tables(session);

	kfree(session);

}

fs/nfs/nfs4session.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +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 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);