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

Commit 2c2fe290 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

nfsd: per-net NFSd up flag introduced 



This patch introduces introduces per-net "nfsd_net_up" boolean flag, which has
the same purpose as general "nfsd_up" flag - skip init or shutdown of per-net
resources in case of they are inited on shutted down respectively.

Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 6ff50b3d

fs/nfsd/netns.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ struct nfsd_net { 


	time_t nfsd4_lease;

	time_t nfsd4_grace;



	bool nfsd_net_up;

};



/* Simple check to find out if a given net was properly initialized */

fs/nfsd/nfssvc.c

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "nfsd.h"

#include "cache.h"

#include "vfs.h"

#include "netns.h"



#define NFSDDBG_FACILITY	NFSDDBG_SVC
@@ -205,8 +206,12 @@ static bool nfsd_up = false; 


static int nfsd_startup_net(struct net *net)

{

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);

	int ret;



	if (nn->nfsd_net_up)

		return 0;



	ret = nfsd_init_socks(net);

	if (ret)

		return ret;
@@ -217,6 +222,7 @@ static int nfsd_startup_net(struct net *net) 
	if (ret)

		goto out_lockd;



	nn->nfsd_net_up = true;

	return 0;



out_lockd:
@@ -257,8 +263,14 @@ static int nfsd_startup(int nrservs, struct net *net) 


static void nfsd_shutdown_net(struct net *net)

{

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);



	if (!nn->nfsd_net_up)

		return;



	nfs4_state_shutdown_net(net);

	lockd_down(net);

	nn->nfsd_net_up = false;

}



static void nfsd_shutdown(struct net *net)