Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

nfsd: pass net to nfsd_create_serv() 



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 db42d1a7

fs/nfsd/nfsctl.c

+2 −2
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static ssize_t __write_ports_addfd(char *buf) 
	if (err != 0 || fd < 0)

		return -EINVAL;



	err = nfsd_create_serv();

	err = nfsd_create_serv(net);

	if (err != 0)

		return err;
@@ -696,7 +696,7 @@ static ssize_t __write_ports_addxprt(char *buf) 
	if (port < 1 || port > USHRT_MAX)

		return -EINVAL;



	err = nfsd_create_serv();

	err = nfsd_create_serv(net);

	if (err != 0)

		return err;

fs/nfsd/nfsd.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL }; 
int nfsd_vers(int vers, enum vers_op change);

int nfsd_minorversion(u32 minorversion, enum vers_op change);

void nfsd_reset_versions(void);

int nfsd_create_serv(void);

int nfsd_create_serv(struct net *net);



extern int nfsd_max_blksize;

fs/nfsd/nfssvc.c

+2 −3
Original line number Diff line number Diff line
@@ -334,10 +334,9 @@ static int nfsd_get_default_max_blksize(void) 
	return ret;

}



int nfsd_create_serv(void)

int nfsd_create_serv(struct net *net)

{

	int error;

	struct net *net = &init_net;



	WARN_ON(!mutex_is_locked(&nfsd_mutex));

	if (nfsd_serv) {
@@ -459,7 +458,7 @@ nfsd_svc(int nrservs) 
	if (nrservs == 0 && nfsd_serv == NULL)

		goto out;



	error = nfsd_create_serv();

	error = nfsd_create_serv(net);

	if (error)

		goto out;