Commit 8936ff47 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Trond Myklebust
Browse files

NFSv4.1: pass transport for callback shutdown 



When we are setting up the 4.1 callback server, we pass in
the appropriate rpc_xprt transport pointer with which to associate
the callback server structure. Similarly, pass in the rpc_xprt
pointer for when we are shutting down the callback. This will be
used to make sure that we free the server structure and then clear
the rpc_xprt's bc_server pointer in a safe manner.

Signed-off-by: default avatarOlga Kornievskaia <okorniev@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 2e47c3cc

fs/nfs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) 
/*

 * Kill the callback thread if it's no longer being used.

 */

void nfs_callback_down(int minorversion, struct net *net)

void nfs_callback_down(int minorversion, struct net *net, struct rpc_xprt *xprt)

{

	struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];

	struct svc_serv *serv;

fs/nfs/callback.h

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ extern __be32 nfs4_callback_recall(void *argp, void *resp, 
				   struct cb_process_state *cps);

#if IS_ENABLED(CONFIG_NFS_V4)

extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);

extern void nfs_callback_down(int minorversion, struct net *net);

extern void nfs_callback_down(int minorversion, struct net *net,

			      struct rpc_xprt *xprt);

#endif /* CONFIG_NFS_V4 */

/*

 * nfs41: Callbacks are expected to not cause substantial latency,

fs/nfs/nfs4client.c

+7 −2
Original line number Diff line number Diff line
@@ -281,8 +281,13 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) 
 */

static void nfs4_destroy_callback(struct nfs_client *clp)

{

	if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state))

		nfs_callback_down(clp->cl_mvops->minor_version, clp->cl_net);

	if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state)) {

		struct rpc_xprt *xprt;



		xprt = rcu_dereference_raw(clp->cl_rpcclient->cl_xprt);

		nfs_callback_down(clp->cl_mvops->minor_version, clp->cl_net,

				  xprt);

	}

}



static void nfs4_shutdown_client(struct nfs_client *clp)