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;
static int nfs_verify_lock_option(struct mount_options *options)
{
- if (po_rightmost(options, nfs_lock_opttbl) == 1)
+ if (po_rightmost(options, nfs_lock_opttbl) == 0)
return 1;
if (!start_statd()) {
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;
}
/*
- * Distinguish between permanent and temporary errors.
+ * Get NFS/mnt server addresses from mount options
*
- * 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.
+ * Returns 1 and fills in @nfs_saddr, @nfs_salen, @mnt_saddr, and @mnt_salen
+ * if all goes well; otherwise zero.
*/
-static int nfs_is_permanent_error(int error)
+static int nfs_extract_server_addresses(struct mount_options *options,
+ struct sockaddr *nfs_saddr,
+ socklen_t *nfs_salen,
+ struct sockaddr *mnt_saddr,
+ socklen_t *mnt_salen)
{
- switch (error) {
- case ESTALE:
- case ETIMEDOUT:
- case ECONNREFUSED:
- return 0; /* temporary */
- default:
- return 1; /* permanent */
- }
+ char *option;
+
+ option = po_get(options, "addr");
+ if (option == NULL)
+ return 0;
+ if (!nfs_string_to_sockaddr(option, strlen(option),
+ nfs_saddr, nfs_salen))
+ return 0;
+
+ option = po_get(options, "mountaddr");
+ if (option == NULL) {
+ memcpy(mnt_saddr, nfs_saddr, *nfs_salen);
+ *mnt_salen = *nfs_salen;
+ } else if (!nfs_string_to_sockaddr(option, strlen(option),
+ mnt_saddr, mnt_salen))
+ return 0;
+
+ return 1;
}
static int nfs_construct_new_options(struct mount_options *options,
static struct mount_options *nfs_rewrite_mount_options(char *str)
{
struct mount_options *options;
+ struct sockaddr_storage nfs_address;
+ struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
+ socklen_t nfs_salen;
+ struct pmap nfs_pmap;
+ struct sockaddr_storage mnt_address;
+ struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
+ socklen_t mnt_salen;
+ struct pmap mnt_pmap;
char *option;
- clnt_addr_t mnt_server = { };
- clnt_addr_t nfs_server = { };
options = po_split(str);
if (!options) {
return NULL;
}
- errno = EINVAL;
- option = po_get(options, "addr");
- if (option) {
- nfs_server.saddr.sin_family = AF_INET;
- if (!inet_aton((const char *)option, &nfs_server.saddr.sin_addr))
- goto err;
- } else
- goto err;
-
- option = po_get(options, "mountaddr");
- if (option) {
- mnt_server.saddr.sin_family = AF_INET;
- if (!inet_aton((const char *)option, &mnt_server.saddr.sin_addr))
- goto err;
- } else
- memcpy(&mnt_server.saddr, &nfs_server.saddr,
- sizeof(mnt_server.saddr));
+ /*
+ * Skip option negotiation for proto=rdma mounts.
+ */
+ option = po_get(options, "proto");
+ if (option && strcmp(option, "rdma") == 0)
+ goto out;
- nfs_options2pmap(options, &nfs_server.pmap, &mnt_server.pmap);
+ /*
+ * 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;
+ }
- /* 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. */
- nfs_server.pmap.pm_prog = NFS_PROGRAM;
- mnt_server.pmap.pm_prog = MOUNTPROG;
+ /*
+ * 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 (!probe_bothports(&mnt_server, &nfs_server)) {
+ /*
+ * 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;
}
- if (!nfs_construct_new_options(options,
- &nfs_server.pmap, &mnt_server.pmap)) {
+ if (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) {
errno = EINVAL;
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.
*
if (!nfs_validate_options(mi))
return EX_FAIL;
- if (po_rightmost(mi->options, nfs_background_opttbl) == 1)
+ if (po_rightmost(mi->options, nfs_background_opttbl) == 0)
return nfsmount_bg(mi);
else
return nfsmount_fg(mi);
.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;