Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

NFS: Add global helper to set up a stand-along nfs4_slot_table 



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

fs/nfs/nfs4session.c

+25 −13
Original line number Diff line number Diff line
@@ -23,6 +23,14 @@ 


#define NFSDBG_FACILITY		NFSDBG_STATE



static void nfs4_init_slot_table(struct nfs4_slot_table *tbl, const char *queue)

{

	tbl->highest_used_slotid = NFS4_NO_SLOT;

	spin_lock_init(&tbl->slot_tbl_lock);

	rpc_init_priority_wait_queue(&tbl->slot_tbl_waitq, queue);

	init_completion(&tbl->complete);

}



/*

 * nfs4_shrink_slot_table - free retired slots from the slot table

 */
@@ -223,6 +231,21 @@ out: 
	return ret;

}



/**

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

 * @tbl: slot table to set up

 * @max_reqs: maximum number of requests allowed

 * @queue: name to give RPC wait queue

 *

 * Returns zero on success, or a negative errno.

 */

int nfs4_setup_slot_table(struct nfs4_slot_table *tbl, unsigned int max_reqs,

		const char *queue)

{

	nfs4_init_slot_table(tbl, queue);

	return nfs4_realloc_slot_table(tbl, max_reqs, 0);

}



static bool nfs41_assign_slot(struct rpc_task *task, void *pslot)

{

	struct nfs4_sequence_args *args = task->tk_msg.rpc_argp;
@@ -425,24 +448,13 @@ int nfs4_setup_session_slot_tables(struct nfs4_session *ses) 
struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp)

{

	struct nfs4_session *session;

	struct nfs4_slot_table *tbl;



	session = kzalloc(sizeof(struct nfs4_session), GFP_NOFS);

	if (!session)

		return NULL;



	tbl = &session->fc_slot_table;

	tbl->highest_used_slotid = NFS4_NO_SLOT;

	spin_lock_init(&tbl->slot_tbl_lock);

	rpc_init_priority_wait_queue(&tbl->slot_tbl_waitq, "ForeChannel Slot table");

	init_completion(&tbl->complete);



	tbl = &session->bc_slot_table;

	tbl->highest_used_slotid = NFS4_NO_SLOT;

	spin_lock_init(&tbl->slot_tbl_lock);

	rpc_init_wait_queue(&tbl->slot_tbl_waitq, "BackChannel Slot table");

	init_completion(&tbl->complete);



	nfs4_init_slot_table(&session->fc_slot_table, "ForeChannel Slot table");

	nfs4_init_slot_table(&session->bc_slot_table, "BackChannel Slot table");

	session->session_state = 1<<NFS4_SESSION_INITING;



	session->clp = clp;

fs/nfs/nfs4session.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ enum nfs4_session_state { 
	NFS4_SESSION_INITING,

};



extern int nfs4_setup_slot_table(struct nfs4_slot_table *tbl,

		unsigned int max_reqs, const char *queue);

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