Change the append_addr_option() function to support sending either IPv4

or IPv6 addresses to the kernel via the "addr=" option.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index a1ffca2face922e7e9e807b73e322d3b0fc4c441..f856998f569b9201d11f0f0398d3592b7ad95fd4 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -237,19 +237,12 @@ out_err:
  * Returns 1 if 'addr=' option appended successfully;
  * otherwise zero.
  */
  * Returns 1 if 'addr=' option appended successfully;
  * otherwise zero.
  */

-static int append_addr_option(struct sockaddr_in *saddr,
-                          struct mount_options *options)
+static int nfs_append_addr_option(const struct sockaddr *sap,
+                                 socklen_t salen,
+                                 struct mount_options *options)

 {
 {

-       char new_option[24];
-

        po_remove_all(options, "addr");
        po_remove_all(options, "addr");

-
-       snprintf(new_option, sizeof(new_option) - 1,
-                       "addr=%s", inet_ntoa(saddr->sin_addr));
-
-       if (po_append(options, new_option) == PO_SUCCEEDED)
-               return 1;
-       return 0;
+       return nfs_append_generic_address_option(sap, salen, "addr", options);

 }
 
 /*
 }
 
 /*


@@ -358,10 +351,8 @@ static int nfs_validate_options(struct nfsmount_info *mi)
        if (!nfs_append_sloppy_option(mi->options))
                return 0;
 
        if (!nfs_append_sloppy_option(mi->options))
                return 0;
 

-       if (!append_addr_option(&saddr, mi->options))
-               return 0;
-
-       return 1;
+       return nfs_append_addr_option((struct sockaddr *)&saddr,
+                                       sizeof(saddr), mi->options);

 }
 
 /*
 }
 
 /*