[PATCH] nfsd: removed unused argument in nfsd_startup_generic()

[PATCH] nfsd: removed unused argument in nfsd_startup_generic()

[Vasily Averin]

Since commit 501cb1849f86 ("nfsd: rip out the raparms cache")
nrservs is not used in nfsd_startup_generic()

Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
 fs/nfsd/nfssvc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 6de4063..1669f5b 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -308,7 +308,7 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred)
 
 static int nfsd_users = 0;
 
-static int nfsd_startup_generic(int nrservs)
+static int nfsd_startup_generic(void)
 {
 	int ret;
 
@@ -374,7 +374,7 @@ void nfsd_reset_boot_verifier(struct nfsd_net *nn)
 	write_sequnlock(&nn->boot_lock);
 }
 
-static int nfsd_startup_net(int nrservs, struct net *net, const struct cred *cred)
+static int nfsd_startup_net(struct net *net, const struct cred *cred)
 {
 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 	int ret;
@@ -382,7 +382,7 @@ static int nfsd_startup_net(int nrservs, struct net *net, const struct cred *cre
 	if (nn->nfsd_net_up)
 		return 0;
 
-	ret = nfsd_startup_generic(nrservs);
+	ret = nfsd_startup_generic();
 	if (ret)
 		return ret;
 	ret = nfsd_init_socks(net, cred);
@@ -758,7 +758,7 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
 
 	nfsd_up_before = nn->nfsd_net_up;
 
-	error = nfsd_startup_net(nrservs, net, cred);
+	error = nfsd_startup_net(net, cred);
 	if (error)
 		goto out_destroy;
 	error = nn->nfsd_serv->sv_ops->svo_setup(nn->nfsd_serv,
-- 
1.8.3.1

Re: [PATCH] nfsd: removed unused argument in nfsd_startup_generic()

[Chuck Lever III]

> On Apr 15, 2021, at 8:00 AM, Vasily Averin <vvs@virtuozzo.com> wrote:
> 
> Since commit 501cb1849f86 ("nfsd: rip out the raparms cache")
> nrservs is not used in nfsd_startup_generic()
> 
> Signed-off-by: Vasily Averin <vvs@virtuozzo.com>

Thanks for your patch. It's been added to the for-next topic branch in

git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git


> ---
> fs/nfsd/nfssvc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
> index 6de4063..1669f5b 100644
> --- a/fs/nfsd/nfssvc.c
> +++ b/fs/nfsd/nfssvc.c
> @@ -308,7 +308,7 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred)
> 
> static int nfsd_users = 0;
> 
> -static int nfsd_startup_generic(int nrservs)
> +static int nfsd_startup_generic(void)
> {
> 	int ret;
> 
> @@ -374,7 +374,7 @@ void nfsd_reset_boot_verifier(struct nfsd_net *nn)
> 	write_sequnlock(&nn->boot_lock);
> }
> 
> -static int nfsd_startup_net(int nrservs, struct net *net, const struct cred *cred)
> +static int nfsd_startup_net(struct net *net, const struct cred *cred)
> {
> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
> 	int ret;
> @@ -382,7 +382,7 @@ static int nfsd_startup_net(int nrservs, struct net *net, const struct cred *cre
> 	if (nn->nfsd_net_up)
> 		return 0;
> 
> -	ret = nfsd_startup_generic(nrservs);
> +	ret = nfsd_startup_generic();
> 	if (ret)
> 		return ret;
> 	ret = nfsd_init_socks(net, cred);
> @@ -758,7 +758,7 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
> 
> 	nfsd_up_before = nn->nfsd_net_up;
> 
> -	error = nfsd_startup_net(nrservs, net, cred);
> +	error = nfsd_startup_net(net, cred);
> 	if (error)
> 		goto out_destroy;
> 	error = nn->nfsd_serv->sv_ops->svo_setup(nn->nfsd_serv,
> -- 
> 1.8.3.1
> 

--
Chuck Lever