X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=a0b9e7fdf80a0f8967bda37c05b1ee34444769a0;hp=76bbefd3104eaf10f117461ae8e1f4fcfd0cd545;hb=2498a68b1bec01d0ee8a63962b314140e8289036;hpb=3faa54e8a17411de28c7b707207d49b4466ae873 diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 76bbefd..a0b9e7f 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) @@ -92,6 +93,25 @@ struct nfsmount_info { child; /* forked bg child? */ }; +#ifdef MOUNT_CONFIG +static void nfs_default_version(struct nfsmount_info *mi); + +static void nfs_default_version(struct nfsmount_info *mi) +{ + extern unsigned long config_default_vers; + /* + * 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; + } +} +#else +inline void nfs_default_version(struct nfsmount_info *mi) {} +#endif /* MOUNT_CONFIG */ + /* * Obtain a retry timeout value based on the value of the "retry=" option. * @@ -258,8 +278,42 @@ static int nfs_append_sloppy_option(struct mount_options *options) return 1; } +static int nfs_set_version(struct nfsmount_info *mi) +{ + 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; + } + + /* + * If we still don't know, check for version-specific + * mount options. + */ + if (mi->version == 0) { + if (po_contains(mi->options, "mounthost") || + po_contains(mi->options, "mountaddr") || + po_contains(mi->options, "mountvers") || + po_contains(mi->options, "mountproto")) + mi->version = 3; + } + + /* + * If enabled, see if the default version was + * set in the config file + */ + nfs_default_version(mi); + + return 1; +} + /* - * Set up mandatory NFS mount options. + * Set up mandatory non-version specific NFS mount options. * * Returns 1 if successful; otherwise zero. */ @@ -274,20 +328,8 @@ static int nfs_validate_options(struct nfsmount_info *mi) if (!nfs_name_to_address(mi->hostname, sap, &mi->salen)) return 0; - if (!nfs_nfs_version(mi->options, &mi->version)) + if (!nfs_set_version(mi)) return 0; - if (strncmp(mi->type, "nfs4", 4) == 0) - mi->version = 4; - - if (mi->version == 4) { - if (!nfs_append_clientaddr_option(sap, mi->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_append_sloppy_option(mi->options)) return 0; @@ -295,12 +337,6 @@ static int nfs_validate_options(struct nfsmount_info *mi) if (!nfs_append_addr_option(sap, mi->salen, mi->options)) return 0; - /* - * Update option string to be recorded in /etc/mnttab - */ - if (po_join(mi->options, mi->extra_opts) == PO_FAILED) - return 0; - return 1; } @@ -490,17 +526,12 @@ out: * Returns TRUE if successful, otherwise FALSE. * "errno" is set to reflect the individual error. */ -static int nfs_try_mount(struct nfsmount_info *mi) +static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts) { char *options = NULL; int result; - if (mi->version != 4) { - if (!nfs_rewrite_pmap_mount_options(mi->options)) - return 0; - } - - if (po_join(mi->options, &options) == PO_FAILED) { + if (po_join(opts, &options) == PO_FAILED) { errno = EIO; return 0; } @@ -522,6 +553,141 @@ static int nfs_try_mount(struct nfsmount_info *mi) return !result; } +/* + * For "-t nfs vers=2" or "-t nfs vers=3" mounts. + */ +static int nfs_try_mount_v3v2(struct nfsmount_info *mi) +{ + struct mount_options *options = po_dup(mi->options); + int result = 0; + + if (!options) { + errno = ENOMEM; + return result; + } + + if (!nfs_fix_mounthost_option(options)) { + errno = EINVAL; + goto out_fail; + } + if (!mi->fake && !nfs_verify_lock_option(options)) { + errno = EINVAL; + goto out_fail; + } + + /* + * 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 (!nfs_rewrite_pmap_mount_options(options)) + goto out_fail; + + result = nfs_sys_mount(mi, options); + +out_fail: + po_destroy(options); + return result; +} + +/* + * For "-t nfs -o vers=4" or "-t nfs4" mounts. + */ +static int nfs_try_mount_v4(struct nfsmount_info *mi) +{ + struct sockaddr *sap = (struct sockaddr *)&mi->address; + struct mount_options *options = po_dup(mi->options); + int result = 0; + + if (!options) { + errno = ENOMEM; + return result; + } + + if (mi->version == 0) { + if (po_contains(options, "mounthost") || + po_contains(options, "mountaddr") || + po_contains(options, "mountvers") || + po_contains(options, "mountproto")) { + /* + * Since these mountd options are set assume version 3 + * is wanted so error out with EPROTONOSUPPORT so the + * protocol negation starts with v3. + */ + errno = EPROTONOSUPPORT; + goto out_fail; + } + 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; + goto out_fail; + } + + result = nfs_sys_mount(mi, options); + +out_fail: + po_destroy(options); + return result; +} + +/* + * This is a single pass through the fg/bg loop. + * + * Returns TRUE if successful, otherwise FALSE. + * "errno" is set to reflect the individual error. + */ +static int nfs_try_mount(struct nfsmount_info *mi) +{ + 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) { + /* + * To deal with legacy Linux servers that don't + * automatically export a pseudo root, retry + * ENOENT errors using version 3 + */ + if (errno != ENOENT) + 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 result; +} + /* * Distinguish between permanent and temporary errors. *