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

nfsd: pass net to nfsd_svc() 



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 6777436b

fs/nfsd/nfsctl.c

+3 −1
Original line number Diff line number Diff line
@@ -396,6 +396,8 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size) 
{

	char *mesg = buf;

	int rv;

	struct net *net = &init_net;



	if (size > 0) {

		int newthreads;

		rv = get_int(&mesg, &newthreads);
@@ -403,7 +405,7 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size) 
			return rv;

		if (newthreads < 0)

			return -EINVAL;

		rv = nfsd_svc(newthreads);

		rv = nfsd_svc(newthreads, net);

		if (rv < 0)

			return rv;

	} else

fs/nfsd/nfsd.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ extern const struct seq_operations nfs_exports_op; 
/*

 * Function prototypes.

 */

int		nfsd_svc(int nrservs);

int		nfsd_svc(int nrservs, struct net *net);

int		nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp);



int		nfsd_nrthreads(void);

fs/nfsd/nfssvc.c

+1 −2
Original line number Diff line number Diff line
@@ -442,11 +442,10 @@ int nfsd_set_nrthreads(int n, int *nthreads) 
 * this is the first time nrservs is nonzero.

 */

int

nfsd_svc(int nrservs)

nfsd_svc(int nrservs, struct net *net)

{

	int	error;

	bool	nfsd_up_before;

	struct net *net = &init_net;



	mutex_lock(&nfsd_mutex);

	dprintk("nfsd: creating service\n");