summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2008-06-06 14:59:21 -0400
committerSteve Dickson <steved@redhat.com>2008-06-06 14:59:21 -0400
commit331c2ca949d5b4b4d18d0aca90afb8ae9475bcd6 (patch)
treef86bab412d8e4adf937bc8c36e9c37a7bf061aa0
parentfd54675db0806e81c17ee7e7eec0abfcd33f1f23 (diff)
downloadnfs-utils-331c2ca949d5b4b4d18d0aca90afb8ae9475bcd6.tar.gz
nfs-utils-331c2ca949d5b4b4d18d0aca90afb8ae9475bcd6.tar.xz
nfs-utils-331c2ca949d5b4b4d18d0aca90afb8ae9475bcd6.zip
Make the text-based mount path check whether statd is running if the "lock"
option is in effect. This echoes similar logic in the legacy mount path. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/mount/stropts.c31
1 files changed, 27 insertions, 4 deletions
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index cdd610e..b2b56be 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -219,13 +219,34 @@ static int fix_mounthost_option(struct mount_options *options)
}
/*
+ * 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;
@@ -236,6 +257,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;
@@ -691,7 +714,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)