Jeff Layton pointed out that the current negotiation logic in
stropts.c simply doesn't handle the case where a server may have an
IPv6 address and an IPv4 address, but only NFS/IPv4 is supported.
This is typical of all currently deployed Linux servers.
Add support for trying all addresses returned from DNS when
"proto=" is not specified on the command line.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
-/*
- * For "-t nfs vers=2" or "-t nfs vers=3" mounts.
- */
-static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
+static int nfs_do_mount_v3v2(struct nfsmount_info *mi,
+ struct sockaddr *sap, socklen_t salen)
- struct addrinfo *ai = mi->address;
struct mount_options *options = po_dup(mi->options);
int result = 0;
struct mount_options *options = po_dup(mi->options);
int result = 0;
- if (!nfs_append_addr_option(ai->ai_addr, ai->ai_addrlen, options)) {
+ if (!nfs_append_addr_option(sap, salen, options)) {
errno = EINVAL;
goto out_fail;
}
errno = EINVAL;
goto out_fail;
}
- * For "-t nfs -o vers=4" or "-t nfs4" mounts.
+ * Attempt a "-t nfs vers=2" or "-t nfs vers=3" mount.
+ *
+ * Returns TRUE if successful, otherwise FALSE.
+ * "errno" is set to reflect the individual error.
-static int nfs_try_mount_v4(struct nfsmount_info *mi)
+static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
+{
+ struct addrinfo *ai;
+ int ret;
+
+ for (ai = mi->address; ai != NULL; ai = ai->ai_next) {
+ ret = nfs_do_mount_v3v2(mi, ai->ai_addr, ai->ai_addrlen);
+ if (ret != 0)
+ return ret;
+
+ switch (errno) {
+ case ECONNREFUSED:
+ case EOPNOTSUPP:
+ case EHOSTUNREACH:
+ continue;
+ default:
+ break;
+ }
+ }
+ return ret;
+}
+
+static int nfs_do_mount_v4(struct nfsmount_info *mi,
+ struct sockaddr *sap, socklen_t salen)
- struct addrinfo *ai = mi->address;
struct mount_options *options = po_dup(mi->options);
int result = 0;
struct mount_options *options = po_dup(mi->options);
int result = 0;
- if (!nfs_append_addr_option(ai->ai_addr, ai->ai_addrlen, options)) {
+ if (!nfs_append_addr_option(sap, salen, options)) {
errno = EINVAL;
goto out_fail;
}
errno = EINVAL;
goto out_fail;
}
- if (!nfs_append_clientaddr_option(ai->ai_addr, ai->ai_addrlen, options)) {
+ if (!nfs_append_clientaddr_option(sap, salen, options)) {
errno = EINVAL;
goto out_fail;
}
errno = EINVAL;
goto out_fail;
}
+/*
+ * Attempt a "-t nfs -o vers=4" or "-t nfs4" mount.
+ *
+ * Returns TRUE if successful, otherwise FALSE.
+ * "errno" is set to reflect the individual error.
+ */
+static int nfs_try_mount_v4(struct nfsmount_info *mi)
+{
+ struct addrinfo *ai;
+ int ret;
+
+ for (ai = mi->address; ai != NULL; ai = ai->ai_next) {
+ ret = nfs_do_mount_v4(mi, ai->ai_addr, ai->ai_addrlen);
+ if (ret != 0)
+ return ret;
+
+ switch (errno) {
+ case ECONNREFUSED:
+ case EHOSTUNREACH:
+ continue;
+ default:
+ break;
+ }
+ }
+ return ret;
+}
+
/*
* This is a single pass through the fg/bg loop.
*
/*
* This is a single pass through the fg/bg loop.
*