mount.nfs: Clean up nfs_is_permanent_error()

[nfs-utils.git] / utils / mount / stropts.c

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 30ac5ae6259034889e6af31695dbd196706295ca..6560f1ce37f9d713ce923261bcef5ed83b7a24f8 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -286,26 +286,6 @@ static int nfs_validate_options(struct nfsmount_info *mi)
        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
  *
@@ -437,6 +417,7 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
        struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
        socklen_t mnt_salen;
        struct pmap mnt_pmap;
+       char *option;
 
        options = po_split(str);
        if (!options) {
@@ -444,23 +425,39 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
                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;
        }
 
-       /* 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;
@@ -472,6 +469,7 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
                goto err;
        }
 
+out:
        errno = 0;
        return options;
 
@@ -532,6 +530,9 @@ static int nfs_retry_nfs23mount(struct nfsmount_info *mi)
                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);
@@ -570,19 +571,6 @@ static int nfs_try_nfs23mount(struct nfsmount_info *mi)
                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);
 }
 
@@ -625,6 +613,31 @@ static int nfs_try_mount(struct nfsmount_info *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.
  *