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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 9c1a960..de424d2 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1214,9 +1214,6 @@
}
}
- nfs_set_port((struct sockaddr *)&mnt->nfs_server.address,
- mnt->nfs_server.port);
-
return 1;
out_nomem:
@@ -1568,6 +1565,9 @@
&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 @@
&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) {