Commit c7d7ec8f authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Remove svc_shutdown_net() 



Clean up: svc_shutdown_net() now does nothing but call
svc_close_net(). Replace all external call sites.

svc_close_net() is renamed to be the inverse of svc_xprt_create().

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 4355d767

fs/lockd/svc.c

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int make_socks(struct svc_serv *serv, struct net *net, 
	if (warned++ == 0)

		printk(KERN_WARNING

			"lockd_up: makesock failed, error=%d\n", err);

	svc_shutdown_net(serv, net);

	svc_xprt_destroy_all(serv, net);

	svc_rpcb_cleanup(serv, net);

	return err;

}
@@ -287,7 +287,7 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net) 
			nlm_shutdown_hosts_net(net);

			cancel_delayed_work_sync(&ln->grace_period_end);

			locks_end_grace(&ln->lockd_manager);

			svc_shutdown_net(serv, net);

			svc_xprt_destroy_all(serv, net);

			svc_rpcb_cleanup(serv, net);

		}

	} else {

fs/nfs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc 
		return;



	dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum);

	svc_shutdown_net(serv, net);

	svc_xprt_destroy_all(serv, net);

}



static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,

fs/nfsd/nfssvc.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ void nfsd_put(struct net *net) 
	struct nfsd_net *nn = net_generic(net, nfsd_net_id);



	if (kref_put(&nn->nfsd_serv->sv_refcnt, nfsd_noop)) {

		svc_shutdown_net(nn->nfsd_serv, net);

		svc_xprt_destroy_all(nn->nfsd_serv, net);

		nfsd_last_thread(nn->nfsd_serv, net);

		svc_destroy(&nn->nfsd_serv->sv_refcnt);

		spin_lock(&nfsd_notifier_lock);

include/linux/sunrpc/svc.h

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int, 
			const struct svc_serv_ops *);

int		   svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);

int		   svc_pool_stats_open(struct svc_serv *serv, struct file *file);

void		   svc_shutdown_net(struct svc_serv *, struct net *);

int		   svc_process(struct svc_rqst *);

int		   bc_svc_process(struct svc_serv *, struct rpc_rqst *,

			struct svc_rqst *);

include/linux/sunrpc/svc_xprt.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ int svc_xprt_create(struct svc_serv *serv, const char *xprt_name, 
			struct net *net, const int family,

			const unsigned short port, int flags,

			const struct cred *cred);

void	svc_xprt_destroy_all(struct svc_serv *serv, struct net *net);

void	svc_xprt_received(struct svc_xprt *xprt);

void	svc_xprt_enqueue(struct svc_xprt *xprt);

void	svc_xprt_put(struct svc_xprt *xprt);