Commit aae2006e authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

nfs41: sunrpc: Export the call prepare state for session reset 



Signed-off-by: default avatarAndy <Adamson&lt;andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c3fad1b1

include/linux/sunrpc/clnt.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ int rpc_call_sync(struct rpc_clnt *clnt, 
			      const struct rpc_message *msg, int flags);

struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred,

			       int flags);

void		rpc_restart_call_prepare(struct rpc_task *);

void		rpc_restart_call(struct rpc_task *);

void		rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);

size_t		rpc_max_payload(struct rpc_clnt *);

include/linux/sunrpc/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ void rpc_show_tasks(void); 
int		rpc_init_mempool(void);

void		rpc_destroy_mempool(void);

extern struct workqueue_struct *rpciod_workqueue;

void		rpc_prepare_task(struct rpc_task *task);



static inline void rpc_exit(struct rpc_task *task, int status)

{

net/sunrpc/clnt.c

+13 −0
Original line number Diff line number Diff line
@@ -694,6 +694,19 @@ void rpc_force_rebind(struct rpc_clnt *clnt) 
}

EXPORT_SYMBOL_GPL(rpc_force_rebind);



/*

 * Restart an (async) RPC call from the call_prepare state.

 * Usually called from within the exit handler.

 */

void

rpc_restart_call_prepare(struct rpc_task *task)

{

	if (RPC_ASSASSINATED(task))

		return;

	task->tk_action = rpc_prepare_task;

}

EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);



/*

 * Restart an (async) RPC call. Usually called from within the

 * exit handler.

net/sunrpc/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ EXPORT_SYMBOL_GPL(rpc_delay); 
/*

 * Helper to call task->tk_ops->rpc_call_prepare

 */

static void rpc_prepare_task(struct rpc_task *task)

void rpc_prepare_task(struct rpc_task *task)

{

	task->tk_ops->rpc_call_prepare(task, task->tk_calldata);

}