iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Add global helper for releasing slot table resources

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2013-08-09 12:49:02 -04:00 committed by Trond Myklebust
parent 744aa52530
commit eb2a1cd3c9
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/nfs/nfs4session.c
View File

@ -231,6 +231,16 @@ out:
return ret; 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 * nfs4_setup_slot_table - prepare a stand-alone slot table for use
* @tbl: slot table to set up * @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) #if defined(CONFIG_NFS_V4_1)
/* Destroy the slot table */ static void nfs4_destroy_session_slot_tables(struct nfs4_session *session)
static void nfs4_destroy_slot_tables(struct nfs4_session *session)
{ {
nfs4_shrink_slot_table(&session->fc_slot_table, 0); nfs4_release_slot_table(&session->fc_slot_table);
nfs4_shrink_slot_table(&session->bc_slot_table, 0); 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) 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_slot_tables(ses); nfs4_destroy_session_slot_tables(ses);
return status; return status;
} }
@ -477,7 +486,7 @@ void nfs4_destroy_session(struct nfs4_session *session)
dprintk("%s Destroy backchannel for xprt %p\n", dprintk("%s Destroy backchannel for xprt %p\n",
__func__, xprt); __func__, xprt);
xprt_destroy_backchannel(xprt, NFS41_BC_MIN_CALLBACKS); xprt_destroy_backchannel(xprt, NFS41_BC_MIN_CALLBACKS);
nfs4_destroy_slot_tables(session); nfs4_destroy_session_slot_tables(session);
kfree(session); kfree(session);
} }

1
fs/nfs/nfs4session.h
View File

@ -74,6 +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 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);