Commit d76cc46b authored by Dai Ngo's avatar Dai Ngo Committed by Chuck Lever
Browse files

NFSD: move create/destroy of laundry_wq to init_nfsd and exit_nfsd 



This patch moves create/destroy of laundry_wq from nfs4_state_start
and nfs4_state_shutdown_net to init_nfsd and exit_nfsd to prevent
the laundromat from being freed while a thread is processing a
conflicting lock.

Reviewed-by: default avatarJ. Bruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarDai Ngo <dai.ngo@oracle.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 3d694271

fs/nfsd/nfs4state.c

+16 −12
Original line number Diff line number Diff line
@@ -127,6 +127,21 @@ static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops; 


static struct workqueue_struct *laundry_wq;



int nfsd4_create_laundry_wq(void)

{

	int rc = 0;



	laundry_wq = alloc_workqueue("%s", WQ_UNBOUND, 0, "nfsd4");

	if (laundry_wq == NULL)

		rc = -ENOMEM;

	return rc;

}



void nfsd4_destroy_laundry_wq(void)

{

	destroy_workqueue(laundry_wq);

}



static bool is_session_dead(struct nfsd4_session *ses)

{

	return ses->se_flags & NFS4_SESSION_DEAD;
@@ -7747,22 +7762,12 @@ nfs4_state_start(void) 
{

	int ret;



	laundry_wq = alloc_workqueue("%s", WQ_UNBOUND, 0, "nfsd4");

	if (laundry_wq == NULL) {

		ret = -ENOMEM;

		goto out;

	}

	ret = nfsd4_create_callback_queue();

	if (ret)

		goto out_free_laundry;

		return ret;



	set_max_delegations();

	return 0;



out_free_laundry:

	destroy_workqueue(laundry_wq);

out:

	return ret;

}



void
@@ -7799,7 +7804,6 @@ nfs4_state_shutdown_net(struct net *net) 
void

nfs4_state_shutdown(void)

{

	destroy_workqueue(laundry_wq);

	nfsd4_destroy_callback_queue();

}

fs/nfsd/nfsctl.c

+4 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,9 @@ static int __init init_nfsd(void) 
	if (retval < 0)

		goto out_free_filesystem;

	retval = register_cld_notifier();

	if (retval)

		goto out_free_all;

	retval = nfsd4_create_laundry_wq();

	if (retval)

		goto out_free_all;

	return 0;
@@ -1566,6 +1569,7 @@ static int __init init_nfsd(void) 


static void __exit exit_nfsd(void)

{

	nfsd4_destroy_laundry_wq();

	unregister_cld_notifier();

	unregister_pernet_subsys(&nfsd_net_ops);

	nfsd_drc_slab_free();

fs/nfsd/nfsd.h

+4 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ void nfs4_state_shutdown_net(struct net *net); 
int nfs4_reset_recoverydir(char *recdir);

char * nfs4_recoverydir(void);

bool nfsd4_spo_must_allow(struct svc_rqst *rqstp);

int nfsd4_create_laundry_wq(void);

void nfsd4_destroy_laundry_wq(void);

#else

static inline int nfsd4_init_slabs(void) { return 0; }

static inline void nfsd4_free_slabs(void) { }
@@ -175,6 +177,8 @@ static inline bool nfsd4_spo_must_allow(struct svc_rqst *rqstp) 
{

	return false;

}

static inline int nfsd4_create_laundry_wq(void) { return 0; };

static inline void nfsd4_destroy_laundry_wq(void) {};

#endif



/*