X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=ceefdb0fc24cecb5a5215db809fbe01fece76251;hp=680156981f8cd131e01a7cb4a674883af10374b4;hb=a8b90e8f64a7d53b20c0980f2a6d9a8d5945bcc4;hpb=ca4e817b083553b6244e81ac91d9db86c09948b1 diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 6801569..ceefdb0 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -45,6 +45,7 @@ #include "parse_opt.h" #include "version.h" #include "parse_dev.h" +#include "conffile.h" #ifndef NFS_PROGRAM #define NFS_PROGRAM (100003) @@ -80,10 +81,13 @@ struct nfsmount_info { *node, /* mounted-on dir */ *type; /* "nfs" or "nfs4" */ char *hostname; /* server's hostname */ + struct sockaddr_storage address; /* server's address */ + socklen_t salen; /* size of server's address */ struct mount_options *options; /* parsed mount options */ char **extra_opts; /* string for /etc/mtab */ + unsigned long version; /* NFS version */ int flags, /* MS_ flags */ fake, /* actually do the mount? */ child; /* forked bg child? */ @@ -130,12 +134,14 @@ static int nfs_append_generic_address_option(const struct sockaddr *sap, { char address[NI_MAXHOST]; char new_option[512]; + int len; if (!nfs_present_sockaddr(sap, salen, address, sizeof(address))) goto out_err; - if (snprintf(new_option, sizeof(new_option), "%s=%s", - keyword, address) >= sizeof(new_option)) + len = snprintf(new_option, sizeof(new_option), "%s=%s", + keyword, address); + if (len < 0 || (size_t)len >= sizeof(new_option)) goto out_err; if (po_append(options, new_option) != PO_SUCCEEDED) @@ -254,56 +260,46 @@ static int nfs_append_sloppy_option(struct mount_options *options) } /* - * Set up mandatory NFS mount options. + * Set up mandatory non-version specific NFS mount options. * * Returns 1 if successful; otherwise zero. */ static int nfs_validate_options(struct nfsmount_info *mi) { - struct sockaddr_storage dummy; - struct sockaddr *sap = (struct sockaddr *)&dummy; - socklen_t salen = sizeof(dummy); + struct sockaddr *sap = (struct sockaddr *)&mi->address; if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL)) return 0; - if (!nfs_name_to_address(mi->hostname, sap, &salen)) + mi->salen = sizeof(mi->address); + if (!nfs_name_to_address(mi->hostname, sap, &mi->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->options)) - return 0; - if (!mi->fake && !nfs_verify_lock_option(mi->options)) - return 0; + if (!nfs_nfs_version(mi->options, &mi->version)) + return 0; + if (strncmp(mi->type, "nfs4", 4) == 0) + mi->version = 4; + else { + char *option = po_get(mi->options, "proto"); + if (option && strcmp(option, "rdma") == 0) + mi->version = 3; + } + /* + * Use the default value set in the config file when + * the version has not been explicitly set. + */ + if (mi->version == 0 && config_default_vers) { + if (config_default_vers < 4) + mi->version = config_default_vers; } if (!nfs_append_sloppy_option(mi->options)) return 0; - return nfs_append_addr_option(sap, salen, mi->options); -} + if (!nfs_append_addr_option(sap, mi->salen, mi->options)) + return 0; -/* - * 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 */ - } + return 1; } /* @@ -323,16 +319,14 @@ static int nfs_extract_server_addresses(struct mount_options *options, option = po_get(options, "addr"); if (option == NULL) return 0; - if (!nfs_string_to_sockaddr(option, strlen(option), - nfs_saddr, nfs_salen)) + if (!nfs_string_to_sockaddr(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)) + } else if (!nfs_string_to_sockaddr(option, mnt_saddr, mnt_salen)) return 0; return 1; @@ -420,31 +414,25 @@ static int nfs_construct_new_options(struct mount_options *options, * * To handle version and transport protocol fallback properly, we * need to parse some of the mount options in order to set up a - * portmap probe. Mount options that nfs_rewrite_mount_options() + * portmap probe. Mount options that nfs_rewrite_pmap_mount_options() * doesn't recognize are left alone. * - * Returns a new group of mount options if successful; otherwise - * NULL is returned if some failure occurred. + * Returns TRUE if rewriting was successful; otherwise + * FALSE is returned if some failure occurred. */ -static struct mount_options *nfs_rewrite_mount_options(char *str) +static int +nfs_rewrite_pmap_mount_options(struct mount_options *options) { - struct mount_options *options; struct sockaddr_storage nfs_address; struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address; - socklen_t nfs_salen; + socklen_t nfs_salen = sizeof(nfs_address); struct pmap nfs_pmap; struct sockaddr_storage mnt_address; struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address; - socklen_t mnt_salen; + socklen_t mnt_salen = sizeof(mnt_address); struct pmap mnt_pmap; char *option; - options = po_split(str); - if (!options) { - errno = EFAULT; - return NULL; - } - /* * Skip option negotiation for proto=rdma mounts. */ @@ -459,11 +447,11 @@ static struct mount_options *nfs_rewrite_mount_options(char *str) if (!nfs_extract_server_addresses(options, nfs_saddr, &nfs_salen, mnt_saddr, &mnt_salen)) { errno = EINVAL; - goto err; + return 0; } if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) { errno = EINVAL; - goto err; + return 0; } /* @@ -481,36 +469,44 @@ static struct mount_options *nfs_rewrite_mount_options(char *str) if (!nfs_probe_bothports(mnt_saddr, mnt_salen, &mnt_pmap, nfs_saddr, nfs_salen, &nfs_pmap)) { errno = ESPIPE; - goto err; + return 0; } if (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) { errno = EINVAL; - goto err; + return 0; } out: errno = 0; - return options; - -err: - po_destroy(options); - return NULL; + return 1; } /* * Do the mount(2) system call. * - * Returns 1 if successful, otherwise zero. + * Returns TRUE if successful, otherwise FALSE. * "errno" is set to reflect the individual error. */ -static int nfs_sys_mount(const struct nfsmount_info *mi, const char *type, - const char *options) +static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts) { + char *options = NULL; int result; - result = mount(mi->spec, mi->node, type, - mi->flags & ~(MS_USER|MS_USERS), options); + if (po_join(opts, &options) == PO_FAILED) { + errno = EIO; + return 0; + } + + if (verbose) + printf(_("%s: trying text-based options '%s'\n"), + progname, options); + + if (mi->fake) + return 1; + + result = mount(mi->spec, mi->node, mi->type, + mi->flags & ~(MS_USER|MS_USERS), options); if (verbose && result) { int save = errno; nfs_error(_("%s: mount(2): %s"), progname, strerror(save)); @@ -520,117 +516,143 @@ static int nfs_sys_mount(const struct nfsmount_info *mi, const char *type, } /* - * Retry an NFS mount that failed because the requested service isn't - * available on the server. - * - * Returns 1 if successful. Otherwise, returns zero. - * "errno" is set to reflect the individual error. - * - * Side effect: If the retry is successful, both 'options' and - * 'extra_opts' are updated to reflect the mount options that worked. - * If the retry fails, 'options' and 'extra_opts' are left unchanged. + * For "-t nfs vers=2" or "-t nfs vers=3" mounts. */ -static int nfs_retry_nfs23mount(struct nfsmount_info *mi) +static int nfs_try_mount_v3v2(struct nfsmount_info *mi) { - struct mount_options *retry_options; - char *retry_str = NULL; - char **extra_opts = mi->extra_opts; + struct mount_options *options = po_dup(mi->options); + int result = 0; - retry_options = nfs_rewrite_mount_options(*extra_opts); - if (!retry_options) - return 0; + if (!options) { + errno = ENOMEM; + return result; + } - if (po_join(retry_options, &retry_str) == PO_FAILED) { - po_destroy(retry_options); - errno = EIO; - return 0; + if (!nfs_fix_mounthost_option(options)) { + errno = EINVAL; + goto out_fail; + } + if (!mi->fake && !nfs_verify_lock_option(options)) { + errno = EINVAL; + goto out_fail; } - if (verbose) - printf(_("%s: text-based options (retry): '%s'\n"), - progname, retry_str); + /* + * Options we negotiate below may be stale by the time this + * file system is unmounted. In order to force umount.nfs + * to renegotiate with the server, only write the user- + * specified options, and not negotiated options, to /etc/mtab. + */ + if (po_join(options, mi->extra_opts) == PO_FAILED) { + errno = ENOMEM; + goto out_fail; + } - if (mi->fake) - return 1; + if (!nfs_rewrite_pmap_mount_options(options)) + goto out_fail; - if (!nfs_sys_mount(mi, "nfs", retry_str)) { - po_destroy(retry_options); - free(retry_str); - return 0; - } + result = nfs_sys_mount(mi, options); - free(*extra_opts); - *extra_opts = retry_str; - po_replace(mi->options, retry_options); - return 1; +out_fail: + po_destroy(options); + return result; } /* - * Attempt an NFSv2/3 mount via a mount(2) system call. If the kernel - * claims the requested service isn't supported on the server, probe - * the server to see what's supported, rewrite the mount options, - * and retry the request. - * - * Returns 1 if successful. Otherwise, returns zero. - * "errno" is set to reflect the individual error. - * - * Side effect: If the retry is successful, both 'options' and - * 'extra_opts' are updated to reflect the mount options that worked. - * If the retry fails, 'options' and 'extra_opts' are left unchanged. + * For "-t nfs -o vers=4" or "-t nfs4" mounts. */ -static int nfs_try_nfs23mount(struct nfsmount_info *mi) +static int nfs_try_mount_v4(struct nfsmount_info *mi) { - char **extra_opts = mi->extra_opts; + struct sockaddr *sap = (struct sockaddr *)&mi->address; + struct mount_options *options = po_dup(mi->options); + int result = 0; - if (po_join(mi->options, extra_opts) == PO_FAILED) { - errno = EIO; + if (!options) { + errno = ENOMEM; + return result; + } + + if (mi->version == 0) { + if (po_append(options, "vers=4") == PO_FAILED) { + errno = EINVAL; + goto out_fail; + } + } + + if (!nfs_append_clientaddr_option(sap, mi->salen, options)) { + errno = EINVAL; + goto out_fail; + } + /* + * Update option string to be recorded in /etc/mtab. + */ + if (po_join(options, mi->extra_opts) == PO_FAILED) { + errno = ENOMEM; return 0; } - if (verbose) - printf(_("%s: text-based options: '%s'\n"), - progname, *extra_opts); + result = nfs_sys_mount(mi, options); - return nfs_retry_nfs23mount(mi); +out_fail: + po_destroy(options); + return result; } /* - * Attempt an NFS v4 mount via a mount(2) system call. + * This is a single pass through the fg/bg loop. * - * Returns 1 if successful. Otherwise, returns zero. + * Returns TRUE if successful, otherwise FALSE. * "errno" is set to reflect the individual error. */ -static int nfs_try_nfs4mount(struct nfsmount_info *mi) +static int nfs_try_mount(struct nfsmount_info *mi) { - char **extra_opts = mi->extra_opts; - - if (po_join(mi->options, extra_opts) == PO_FAILED) { + int result = 0; + + switch (mi->version) { + case 0: + if (linux_version_code() > MAKE_VERSION(2, 6, 31)) { + errno = 0; + result = nfs_try_mount_v4(mi); + if (errno != EPROTONOSUPPORT) + break; + } + case 2: + case 3: + result = nfs_try_mount_v3v2(mi); + break; + case 4: + result = nfs_try_mount_v4(mi); + break; + default: errno = EIO; - return 0; } - if (verbose) - printf(_("%s: text-based options: '%s'\n"), - progname, *extra_opts); - - if (mi->fake) - return 1; - - return nfs_sys_mount(mi, "nfs4", *extra_opts); + return result; } /* - * Perform either an NFSv2/3 mount, or an NFSv4 mount system call. + * Distinguish between permanent and temporary errors. * - * Returns 1 if successful. Otherwise, returns zero. - * "errno" is set to reflect the individual error. + * 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_try_mount(struct nfsmount_info *mi) +static int nfs_is_permanent_error(int error) { - if (strncmp(mi->type, "nfs4", 4) == 0) - return nfs_try_nfs4mount(mi); - else - return nfs_try_nfs23mount(mi); + switch (error) { + case ESTALE: + case ETIMEDOUT: + case ECONNREFUSED: + return 0; /* temporary */ + default: + return 1; /* permanent */ + } } /*