Commit 3938a0d5 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

nfsd: pass net to nfsd_set_nrthreads() 



Precursor patch. Hard-coded "init_net" will be replaced by proper one in
future.

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

fs/nfsd/nfsctl.c

+2 −1
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size) 
	int len;

	int npools;

	int *nthreads;

	struct net *net = &init_net;



	mutex_lock(&nfsd_mutex);

	npools = nfsd_nrpools();
@@ -477,7 +478,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size) 
			if (nthreads[i] < 0)

				goto out_free;

		}

		rv = nfsd_set_nrthreads(i, nthreads);

		rv = nfsd_set_nrthreads(i, nthreads, net);

		if (rv)

			goto out_free;

	}

fs/nfsd/nfsd.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); 
int		nfsd_nrthreads(void);

int		nfsd_nrpools(void);

int		nfsd_get_nrthreads(int n, int *);

int		nfsd_set_nrthreads(int n, int *);

int		nfsd_set_nrthreads(int n, int *, struct net *);

int		nfsd_pool_stats_open(struct inode *, struct file *);

int		nfsd_pool_stats_release(struct inode *, struct file *);

fs/nfsd/nfssvc.c

+1 −2
Original line number Diff line number Diff line
@@ -382,12 +382,11 @@ int nfsd_get_nrthreads(int n, int *nthreads) 
	return 0;

}



int nfsd_set_nrthreads(int n, int *nthreads)

int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)

{

	int i = 0;

	int tot = 0;

	int err = 0;

	struct net *net = &init_net;



	WARN_ON(!mutex_is_locked(&nfsd_mutex));