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

Commit ed596a8a authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Move the nfs_set_port() call out of nfs_parse_mount_options() 



The remount path does not need to set the port in the server address.
Since it's not really a part of option parsing, move the nfs_set_port()
call to nfs_parse_mount_options()'s callers.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 259875ef

fs/nfs/super.c

+6 −3
Original line number Diff line number Diff line
@@ -1214,9 +1214,6 @@ static int nfs_parse_mount_options(char *raw, 
		}

	}



	nfs_set_port((struct sockaddr *)&mnt->nfs_server.address,

				mnt->nfs_server.port);



	return 1;



out_nomem:
@@ -1568,6 +1565,9 @@ static int nfs_validate_mount_data(void *options, 
						&args->nfs_server.address))

			goto out_no_address;



		nfs_set_port((struct sockaddr *)&args->nfs_server.address,

				args->nfs_server.port);



		nfs_set_mount_transport_protocol(args);



		status = nfs_parse_devname(dev_name,
@@ -2197,6 +2197,9 @@ static int nfs4_validate_mount_data(void *options, 
						&args->nfs_server.address))

			return -EINVAL;



		nfs_set_port((struct sockaddr *)&args->nfs_server.address,

				args->nfs_server.port);



		nfs_validate_transport_protocol(args);



		switch (args->auth_flavor_len) {