Commit c8ceb412 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Trond Myklebust
Browse files

NFS: pass net to nfs_callback_down() 



Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6168f62c

fs/nfs/callback.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,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)

void nfs_callback_down(int minorversion, struct net *net)

{

	struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
@@ -309,7 +309,7 @@ void nfs_callback_down(int minorversion) 
	cb_info->users--;

	if (cb_info->users == 0 && cb_info->task != NULL) {

		kthread_stop(cb_info->task);

		svc_shutdown_net(cb_info->serv, &init_net);

		svc_shutdown_net(cb_info->serv, net);

		svc_exit_thread(cb_info->rqst);

		cb_info->serv = NULL;

		cb_info->rqst = NULL;

fs/nfs/callback.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy, 
				   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);

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

extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation,

					    const nfs4_stateid *stateid);

extern int nfs4_set_callback_sessionid(struct nfs_client *clp);

fs/nfs/nfs4client.c

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

		nfs_callback_down(clp->cl_mvops->minor_version, &init_net);

}



static void nfs4_shutdown_client(struct nfs_client *clp)