Update nfs_try_mount() to support AF_INET6 family addresses.
Signed-off-by: Chuck Lever <[email protected]>
---
fs/nfs/super.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 5ecbb67..7c10189 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1025,7 +1025,7 @@ out_unknown:
static int nfs_try_mount(struct nfs_parsed_mount_data *args,
struct nfs_fh *root_fh)
{
- struct sockaddr_in sin;
+ struct sockaddr *sap = (struct sockaddr *)&args->mount_server.address;
int status;
char *hostname;
@@ -1044,23 +1044,20 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
/*
* Construct the mount server's address.
*/
- if (args->mount_server.address.ss_family != AF_UNSPEC)
- memcpy(&sin, &args->mount_server.address, sizeof(sin));
- else
- memcpy(&sin, &args->nfs_server.address, sizeof(sin));
+ if (args->mount_server.address.ss_family == AF_UNSPEC)
+ memcpy(sap, &args->nfs_server.address,
+ sizeof(struct sockaddr_in6));
/*
* autobind will be used if mount_server.port == 0
*/
- nfs_set_port((void *)&sin, args->mount_server.port);
+ nfs_set_port(sap, args->mount_server.port);
/*
* Now ask the mount server to map our export path
* to a file handle.
*/
- status = nfs_mount((struct sockaddr *) &sin,
- sizeof(sin),
- hostname,
+ status = nfs_mount(sap, 0, hostname,
args->nfs_server.export_path,
args->mount_server.version,
args->mount_server.protocol,
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
_______________________________________________
Please note that [email protected] is being discontinued.
Please subscribe to [email protected] instead.
http://vger.kernel.org/vger-lists.html#linux-nfs