Steinar Gunderson reports:

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 31df51b958b8d08be9b28b1428759d1cd1b53b71..ad5bdee598c243c5c1f05903d75121be3c0f3eac 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -61,6 +65,14 @@
 #define NFS_MAXPATHNAME                (1024)
 #endif
 
+#ifndef NFS_DEF_FG_TIMEOUT_MINUTES
+#define NFS_DEF_FG_TIMEOUT_MINUTES     (2u)
+#endif
+
+#ifndef NFS_DEF_BG_TIMEOUT_MINUTES
+#define NFS_DEF_BG_TIMEOUT_MINUTES     (10000u)
+#endif
+
 extern int nfs_mount_data_version;
 extern char *progname;
 extern int verbose;
@@ -136,6 +148,32 @@ static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
        return 1;
 }
 
+/*
+ * Obtain a retry timeout value based on the value of the "retry=" option.
+ *
+ * Returns a time_t timeout timestamp, in seconds.
+ */
+static time_t nfs_parse_retry_option(struct mount_options *options,
+                                    unsigned int timeout_minutes)
+{
+       char *retry_option, *endptr;
+
+       retry_option = po_get(options, "retry");
+       if (retry_option) {
+               long tmp;
+
+               errno = 0;
+               tmp = strtol(retry_option, &endptr, 10);
+               if (errno == 0 && endptr != retry_option && tmp >= 0)
+                       timeout_minutes = tmp;
+               else if (verbose)
+                       nfs_error(_("%s: invalid retry timeout was specified; "
+                                       "using default timeout"), progname);
+       }
+
+       return time(NULL) + (time_t)(timeout_minutes * 60);
+}
+
 /*
  * Append the 'addr=' option to the options string to pass a resolved
  * server address to the kernel.  After a successful mount, this address
@@ -214,14 +252,35 @@ static int fix_mounthost_option(struct mount_options *options)
        return 0;
 }
 
+/*
+ * Returns zero if the "lock" option is in effect, but statd
+ * can't be started.  Otherwise, returns 1.
+ */
+static int verify_lock_option(struct mount_options *options)
+{
+       if (po_rightmost(options, "nolock", "lock") == PO_KEY1_RIGHTMOST)
+               return 1;
+
+       if (!start_statd()) {
+               nfs_error(_("%s: rpc.statd is not running but is "
+                           "required for remote locking."), progname);
+               nfs_error(_("%s: Either use '-o nolock' to keep "
+                           "locks local, or start statd."), progname);
+               return 0;
+       }
+
+       return 1;
+}
+
 /*
  * Set up mandatory mount options.
  *
  * Returns 1 if successful; otherwise zero.
  */
-static int set_mandatory_options(const char *type,
-                                struct sockaddr_in *saddr,
-                                struct mount_options *options)
+static int validate_options(const char *type,
+                           struct sockaddr_in *saddr,
+                           struct mount_options *options,
+                           int fake)
 {
        if (!append_addr_option(saddr, options))
                return 0;
@@ -232,6 +291,8 @@ static int set_mandatory_options(const char *type,
        } else {
                if (!fix_mounthost_option(options))
                        return 0;
+               if (!fake && !verify_lock_option(options))
+                       return 0;
        }
 
        return 1;
@@ -248,7 +309,6 @@ static int set_mandatory_options(const char *type,
 static int is_permanent_error(int error)
 {
        switch (error) {
-       case EACCES:
        case ESTALE:
        case ETIMEDOUT:
        case ECONNREFUSED:
@@ -304,9 +364,6 @@ static struct mount_options *rewrite_mount_options(char *str)
        if (option)
                mnt_server.pmap.pm_port = atoi(option);
        mnt_server.pmap.pm_prog = MOUNTPROG;
-       option = po_get(options, "mountprog");
-       if (option)
-               mnt_server.pmap.pm_prog = atoi(option);
        option = po_get(options, "mountvers");
        if (option)
                mnt_server.pmap.pm_vers = atoi(option);
@@ -534,14 +591,9 @@ static int nfsmount_fg(const char *spec, const char *node,
                       char **extra_opts)
 {
        unsigned int secs = 1;
-       time_t timeout = time(NULL);
-       char *retry;
-
-       timeout += 60 * 2;              /* default: 2 minutes */
-       retry = po_get(options, "retry");
-       if (retry)
-               timeout += 60 * atoi(retry);
+       time_t timeout;
 
+       timeout = nfs_parse_retry_option(options, NFS_DEF_FG_TIMEOUT_MINUTES);
        if (verbose)
                printf(_("%s: timeout set for %s"),
                        progname, ctime(&timeout));
@@ -611,13 +663,9 @@ static int nfsmount_child(const char *spec, const char *node,
                          int fake, char **extra_opts)
 {
        unsigned int secs = 1;
-       time_t timeout = time(NULL);
-       char *retry;
+       time_t timeout;
 
-       timeout += 60 * 10000;          /* default: 10,000 minutes */
-       retry = po_get(options, "retry");
-       if (retry)
-               timeout += 60 * atoi(retry);
+       timeout = nfs_parse_retry_option(options, NFS_DEF_BG_TIMEOUT_MINUTES);
 
        for (;;) {
                if (sleep(secs))
@@ -691,7 +739,7 @@ int nfsmount_string(const char *spec, const char *node, const char *type,
                goto fail;
        }
 
-       if (!set_mandatory_options(type, &saddr, options))
+       if (!validate_options(type, &saddr, options, fake))
                goto out;
 
        if (po_rightmost(options, "bg", "fg") == PO_KEY1_RIGHTMOST)