Return-Path: linux-nfs-owner@vger.kernel.org Received: from userp1040.oracle.com ([156.151.31.81]:33907 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755634Ab3L3RyM convert rfc822-to-8bit (ORCPT ); Mon, 30 Dec 2013 12:54:12 -0500 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) Subject: Re: [PATCH 2/2] NFSD: supports nfsv4 service without rpcbind From: Chuck Lever In-Reply-To: <52C15847.9030208@gmail.com> Date: Mon, 30 Dec 2013 12:54:16 -0500 Cc: "J.,Bruce Fields" , Gareth Williams , Linux NFS Mailing List , trond.myklebust@primarydata.com Message-Id: <68E6D30F-B2D6-4919-9748-E7F1162AC3B7@oracle.com> References: <52B47A12.2070202@garethwilliams.me.uk> <20131223173956.GA9221@fieldses.org> <52BD53CA.5050205@gmail.com> <7FD776EA-EAA8-41E0-9567-BF3924D365AC@oracle.com> <20131227184309.GA9161@fieldses.org> <01763B6D-C8CB-46B7-87AC-CE189496019A@oracle.com> <6E281EC9-49CB-4BDA-BDF3-7A6F4B703156@gmail.com> <5D65FDE6-D1AB-442C-BFD8-141AB87FF321@gmail.com> <52C1577B.9080100@gmail.com> <52C15847.9030208@gmail.com> To: Kinglong Mee Sender: linux-nfs-owner@vger.kernel.org List-ID: On Dec 30, 2013, at 6:25 AM, Kinglong Mee wrote: > 1. set vs_ignore_err for nfsd_version4 > 2. don't start lockd when only supports nfsv4 > > Signed-off-by: Kinglong Mee > --- > fs/nfsd/netns.h | 1 + > fs/nfsd/nfs4proc.c | 1 + > fs/nfsd/nfssvc.c | 26 +++++++++++++++++++++----- > 3 files changed, 23 insertions(+), 5 deletions(-) > > diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h > index 849a7c3..d32b3aa 100644 > --- a/fs/nfsd/netns.h > +++ b/fs/nfsd/netns.h > @@ -95,6 +95,7 @@ struct nfsd_net { > time_t nfsd4_grace; > > bool nfsd_net_up; > + bool lockd_up; > > /* > * Time of server startup > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c > index 419572f..9320986 100644 > --- a/fs/nfsd/nfs4proc.c > +++ b/fs/nfsd/nfs4proc.c > @@ -1881,6 +1881,7 @@ struct svc_version nfsd_version4 = { > .vs_proc = nfsd_procedures4, > .vs_dispatch = nfsd_dispatch, > .vs_xdrsize = NFS4_SVC_XDRSIZE, > + .vs_ignore_err = 1, It's better, I think, to include this hunk in 1/1. That way, that one patch can be merged into stable, or cherry-picked by a distribution. Also, just a nit: ".vs_ignore_err" is a rather generic name. Something more specific like ".vs_rpcb_optnl" would be nicer, or reverse the logic and call it ".vs_rpcb_needed". > }; > > /* > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > index 760c85a..55b5b57 100644 > --- a/fs/nfsd/nfssvc.c > +++ b/fs/nfsd/nfssvc.c > @@ -241,6 +241,11 @@ static void nfsd_shutdown_generic(void) > nfsd_racache_shutdown(); > } > > +static bool nfsd_needs_lockd(void) > +{ > + return (nfsd_versions[2] != NULL) || (nfsd_versions[3] != NULL); > +} How does this logic know which version of nfsd is being started? > + > static int nfsd_startup_net(int nrservs, struct net *net) > { > struct nfsd_net *nn = net_generic(net, nfsd_net_id); > @@ -255,9 +260,14 @@ static int nfsd_startup_net(int nrservs, struct net *net) > ret = nfsd_init_socks(net); > if (ret) > goto out_socks; > - ret = lockd_up(net); > - if (ret) > - goto out_socks; > + > + if (nfsd_needs_lockd() && !nn->lockd_up) { > + ret = lockd_up(net); > + if (ret) > + goto out_socks; > + nn->lockd_up = 1; > + } > + > ret = nfs4_state_start_net(net); > if (ret) > goto out_lockd; > @@ -266,7 +276,10 @@ static int nfsd_startup_net(int nrservs, struct net *net) > return 0; > > out_lockd: > - lockd_down(net); > + if (nn->lockd_up) { > + lockd_down(net); > + nn->lockd_up = 0; > + } > out_socks: > nfsd_shutdown_generic(); > return ret; > @@ -277,7 +290,10 @@ static void nfsd_shutdown_net(struct net *net) > struct nfsd_net *nn = net_generic(net, nfsd_net_id); > > nfs4_state_shutdown_net(net); > - lockd_down(net); > + if (nn->lockd_up) { > + lockd_down(net); > + nn->lockd_up = 0; > + } > nn->nfsd_net_up = false; > nfsd_shutdown_generic(); > } > -- > 1.8.4.2 > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Chuck Lever chuck[dot]lever[at]oracle[dot]com