We'll need to set the port number of an AF_INET or AF_INET6 address in
several places in fs/nfs/super.c, so introduce a helper that can manage
this for us. We put this helper to immediate use.
Signed-off-by: Chuck Lever <[EMAIL PROTECTED]>
---
fs/nfs/super.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 262adb4..7dc56ce 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -45,6 +45,7 @@
#include <linux/nfs_idmap.h>
#include <linux/vfs.h>
#include <linux/inet.h>
+#include <linux/in6.h>
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
#include <linux/parser.h>
@@ -574,6 +575,28 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int
flags)
}
/*
+ * Set the port number in an address. Be agnostic about the address family.
+ */
+static int nfs_set_address_port(struct sockaddr *sap, unsigned short port)
+{
+ switch (sap->sa_family) {
+ case AF_INET: {
+ struct sockaddr_in *ap = (struct sockaddr_in *)sap;
+ ap->sin_port = htons(port);
+ return 0;
+ }
+ case AF_INET6: {
+ struct sockaddr_in6 *ap = (struct sockaddr_in6 *)sap;
+ ap->sin6_port = htons(port);
+ return 0;
+ }
+ default:
+ dfprintk(MOUNT, "NFS: unrecognized address family\n");
+ return -EAFNOSUPPORT;
+ }
+}
+
+/*
* Sanity-check a server address provided by the mount command
*/
static int nfs_verify_server_address(struct sockaddr *addr)
@@ -691,6 +714,7 @@ static int nfs_parse_mount_options(char *raw,
struct nfs_parsed_mount_data *mnt)
{
char *p, *string;
+ unsigned short port = 0;
if (!raw) {
dfprintk(MOUNT, "NFS: mount options string was NULL.\n");
@@ -793,7 +817,7 @@ static int nfs_parse_mount_options(char *raw,
return 0;
if (option < 0 || option > 65535)
return 0;
- mnt->nfs_server.address.sin_port = htons(option);
+ port = option;
break;
case Opt_rsize:
if (match_int(args, &mnt->rsize))
@@ -978,6 +1002,10 @@ static int nfs_parse_mount_options(char *raw,
}
}
+ if (nfs_set_address_port((struct sockaddr *)
+ &mnt->nfs_server.address, port))
+ return 0;
+
return 1;
out_nomem:
@@ -1030,7 +1058,9 @@ static int nfs_try_mount(struct nfs_parsed_mount_data
*args,
/*
* autobind will be used if mount_server.port == 0
*/
- sin.sin_port = htons(args->mount_server.port);
+ if (nfs_set_address_port((struct sockaddr *)&sin,
+ args->mount_server.port))
+ return -EAFNOSUPPORT;
/*
* Now ask the mount server to map our export path
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
