int flags, /* MS_ flags */
fake, /* actually do the mount? */
child; /* forked bg child? */
-
- sa_family_t family; /* supported address family */
};
/*
* Resolve the 'mounthost=' hostname and append a new option using
* the resulting address.
*/
-static int nfs_fix_mounthost_option(const sa_family_t family,
- struct mount_options *options)
+static int nfs_fix_mounthost_option(struct mount_options *options)
{
struct sockaddr_storage dummy;
struct sockaddr *sap = (struct sockaddr *)&dummy;
if (!mounthost)
return 1;
- if (!nfs_name_to_address(mounthost, family, sap, &salen)) {
+ if (!nfs_name_to_address(mounthost, sap, &salen)) {
nfs_error(_("%s: unable to determine mount server's address"),
progname);
return 0;
if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
return 0;
- if (!nfs_name_to_address(mi->hostname, mi->family, sap, &salen))
+ if (!nfs_name_to_address(mi->hostname, sap, &salen))
return 0;
if (strncmp(mi->type, "nfs4", 4) == 0) {
if (!nfs_append_clientaddr_option(sap, salen, mi->options))
return 0;
} else {
- if (!nfs_fix_mounthost_option(mi->family, mi->options))
+ if (!nfs_fix_mounthost_option(mi->options))
return 0;
if (!mi->fake && !nfs_verify_lock_option(mi->options))
return 0;
return nfs_append_addr_option(sap, salen, mi->options);
}
-/*
- * Distinguish between permanent and temporary errors.
- *
- * Returns 0 if the passed-in error is temporary, thus the
- * mount system call should be retried; returns one if the
- * passed-in error is permanent, thus the mount system call
- * should not be retried.
- */
-static int nfs_is_permanent_error(int error)
-{
- switch (error) {
- case ESTALE:
- case ETIMEDOUT:
- case ECONNREFUSED:
- return 0; /* temporary */
- default:
- return 1; /* permanent */
- }
-}
-
/*
* Get NFS/mnt server addresses from mount options
*
return 0;
option = po_get(options, "mountaddr");
- if (option == NULL)
+ if (option == NULL) {
memcpy(mnt_saddr, nfs_saddr, *nfs_salen);
- else if (!nfs_string_to_sockaddr(option, strlen(option),
+ *mnt_salen = *nfs_salen;
+ } else if (!nfs_string_to_sockaddr(option, strlen(option),
mnt_saddr, mnt_salen))
return 0;
struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
socklen_t mnt_salen;
struct pmap mnt_pmap;
+ char *option;
options = po_split(str);
if (!options) {
return NULL;
}
+ /*
+ * Skip option negotiation for proto=rdma mounts.
+ */
+ option = po_get(options, "proto");
+ if (option && strcmp(option, "rdma") == 0)
+ goto out;
+
+ /*
+ * Extract just the options needed to contact server.
+ * Bail now if any of these have bad values.
+ */
if (!nfs_extract_server_addresses(options, nfs_saddr, &nfs_salen,
mnt_saddr, &mnt_salen)) {
errno = EINVAL;
goto err;
}
+ if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) {
+ errno = EINVAL;
+ goto err;
+ }
- nfs_options2pmap(options, &nfs_pmap, &mnt_pmap);
-
- /* The kernel NFS client doesn't support changing the RPC program
- * number for these services, so reset these fields before probing
- * the server's ports. */
+ /*
+ * The kernel NFS client doesn't support changing the RPC
+ * program number for these services, so force the value of
+ * these fields before probing the server's ports.
+ */
nfs_pmap.pm_prog = NFS_PROGRAM;
mnt_pmap.pm_prog = MOUNTPROG;
+ /*
+ * If the server's rpcbind service isn't available, we can't
+ * negotiate. Bail now if we can't contact it.
+ */
if (!nfs_probe_bothports(mnt_saddr, mnt_salen, &mnt_pmap,
nfs_saddr, nfs_salen, &nfs_pmap)) {
errno = ESPIPE;
goto err;
}
+out:
errno = 0;
return options;
printf(_("%s: text-based options (retry): '%s'\n"),
progname, retry_str);
+ if (mi->fake)
+ return 1;
+
if (!nfs_sys_mount(mi, "nfs", retry_str)) {
po_destroy(retry_options);
free(retry_str);
printf(_("%s: text-based options: '%s'\n"),
progname, *extra_opts);
- if (mi->fake)
- return 1;
-
- if (nfs_sys_mount(mi, "nfs", *extra_opts))
- return 1;
-
- /*
- * The kernel returns EOPNOTSUPP if the RPC bind failed,
- * and EPROTONOSUPPORT if the version isn't supported.
- */
- if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
- return 0;
-
return nfs_retry_nfs23mount(mi);
}
return nfs_try_nfs23mount(mi);
}
+/*
+ * Distinguish between permanent and temporary errors.
+ *
+ * Basically, we retry if communication with the server has
+ * failed so far, but fail immediately if there is a local
+ * error (like a bad mount option).
+ *
+ * ESTALE is also a temporary error because some servers
+ * return ESTALE when a share is temporarily offline.
+ *
+ * Returns 1 if we should fail immediately, or 0 if we
+ * should retry.
+ */
+static int nfs_is_permanent_error(int error)
+{
+ switch (error) {
+ case ESTALE:
+ case ETIMEDOUT:
+ case ECONNREFUSED:
+ return 0; /* temporary */
+ default:
+ return 1; /* permanent */
+ }
+}
+
/*
* Handle "foreground" NFS mounts.
*
.flags = flags,
.fake = fake,
.child = child,
-#ifdef IPV6_SUPPORTED
- .family = AF_UNSPEC, /* either IPv4 or v6 */
-#else
- .family = AF_INET, /* only IPv4 */
-#endif
};
int retval = EX_FAIL;