Add temporary mount options

Add the required kernel side infrastructure to parse arbitrary
mount options.  This enables us to support temporary mount
options in largely the same way it is handled on other platforms.

See the 'Temporary Mount Point Properties' section of zfs(8)
for complete details.

Signed-off-by: Brian Behlendorf <[email protected]>
Closes #985
Closes #3351

5 files changed, 3 insertions, 107 deletions

diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am
index cd8a29fb5..6aad8450f 100644
--- a/lib/libspl/include/sys/Makefile.am
+++ b/lib/libspl/include/sys/Makefile.am
@@ -26,7 +26,6 @@ libspl_HEADERS = \
 	$(top_srcdir)/lib/libspl/include/sys/list_impl.h \
 	$(top_srcdir)/lib/libspl/include/sys/mhd.h \
 	$(top_srcdir)/lib/libspl/include/sys/mkdev.h \
-	$(top_srcdir)/lib/libspl/include/sys/mntent.h \
 	$(top_srcdir)/lib/libspl/include/sys/mnttab.h \
 	$(top_srcdir)/lib/libspl/include/sys/mount.h \
 	$(top_srcdir)/lib/libspl/include/sys/note.h \
diff --git a/lib/libspl/include/sys/mntent.h b/lib/libspl/include/sys/mntent.h
deleted file mode 100644
index b57ffee83..000000000
--- a/lib/libspl/include/sys/mntent.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- *	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
- *		All Rights Reserved
- */
-
-#ifndef _SYS_MNTENT_H
-#define	_SYS_MNTENT_H
-
-#define	MNTTYPE_ZFS	"zfs"		/* ZFS file system */
-
-#define	MOUNT_SUCCESS	0x00		/* Success */
-#define	MOUNT_USAGE	0x01		/* Invalid invocation or permissions */
-#define	MOUNT_SYSERR	0x02		/* System error (ENOMEM, etc) */
-#define	MOUNT_SOFTWARE	0x04		/* Internal mount bug */
-#define	MOUNT_USER	0x08		/* Interrupted by user (EINTR) */
-#define	MOUNT_FILEIO	0x10		/* Error updating/locking /etc/mtab */
-#define	MOUNT_FAIL	0x20		/* Mount failed */
-#define	MOUNT_SOMEOK	0x40		/* At least on mount succeeded */
-#define	MOUNT_BUSY	0x80		/* Mount failed due to EBUSY */
-
-#define	MNTOPT_ASYNC	"async"		/* all I/O is asynchronous */
-#define	MNTOPT_ATIME	"atime"		/* update atime for files */
-#define	MNTOPT_NOATIME	"noatime"	/* do not update atime for files */
-#define	MNTOPT_AUTO	"auto"		/* automount */
-#define	MNTOPT_NOAUTO	"noauto"	/* do not automount */
-#define	MNTOPT_CONTEXT	"context"	/* selinux context */
-#define	MNTOPT_FSCONTEXT "fscontext"	/* selinux fscontext */
-#define	MNTOPT_DEFCONTEXT "defcontext"	/* selinux defcontext */
-#define	MNTOPT_ROOTCONTEXT "rootcontext" /* selinux rootcontext */
-#define	MNTOPT_DEFAULTS	"defaults"	/* defaults */
-#define	MNTOPT_DEVICES	"dev"		/* device-special allowed */
-#define	MNTOPT_NODEVICES "nodev"	/* device-special disallowed */
-#define	MNTOPT_DIRATIME	"diratime"	/* update atime for dirs */
-#define	MNTOPT_NODIRATIME "nodiratime"	/* do not update atime for dirs */
-#define	MNTOPT_DIRSYNC	"dirsync"	/* do dir updates synchronously */
-#define	MNTOPT_EXEC	"exec"		/* enable executables */
-#define	MNTOPT_NOEXEC	"noexec"	/* disable executables */
-#define	MNTOPT_GROUP	"group"		/* allow group mount */
-#define	MNTOPT_NOGROUP	"nogroup"	/* do not allow group mount */
-#define	MNTOPT_IVERSION	"iversion"	/* update inode version */
-#define	MNTOPT_NOIVERSION "noiversion"	/* do not update inode version */
-#define	MNTOPT_NBMAND	"mand"		/* allow non-blocking mandatory locks */
-#define	MNTOPT_NONBMAND	"nomand"	/* deny non-blocking mandatory locks */
-#define	MNTOPT_NETDEV	"_netdev"	/* network device */
-#define	MNTOPT_NOFAIL	"nofail"	/* no failure */
-#define	MNTOPT_RELATIME	"relatime"	/* allow relative time updates */
-#define	MNTOPT_NORELATIME "norelatime"	/* do not allow relative time updates */
-#define	MNTOPT_DFRATIME	"strictatime"	/* Deferred access time updates */
-#define	MNTOPT_NODFRATIME "nostrictatime" /* No Deferred access time updates */
-#define	MNTOPT_SETUID	"suid"		/* Both setuid and devices allowed */
-#define	MNTOPT_NOSETUID	"nosuid"	/* Neither setuid nor devices allowed */
-#define	MNTOPT_OWNER	"owner"		/* allow owner mount */
-#define	MNTOPT_NOOWNER	"noowner"	/* do not allow owner mount */
-#define	MNTOPT_REMOUNT	"remount"	/* change mount options */
-#define	MNTOPT_RO	"ro"		/* read only */
-#define	MNTOPT_RW	"rw"		/* read/write */
-#define	MNTOPT_SYNC	"sync"		/* all I/O is synchronous */
-#define	MNTOPT_USER	"user"		/* allow user mount */
-#define	MNTOPT_NOUSER	"nouser"	/* do not allow user mount */
-#define	MNTOPT_USERS	"users"		/* allow user mount */
-#define	MNTOPT_NOUSERS	"nousers"	/* do not allow user mount */
-#define	MNTOPT_SUB	"sub"		/* allow mounts on subdirs */
-#define	MNTOPT_NOSUB	"nosub"		/* do not allow mounts on subdirs */
-#define	MNTOPT_QUIET	"quiet"		/* quiet mount */
-#define	MNTOPT_LOUD	"loud"		/* verbose mount */
-#define	MNTOPT_BIND	"bind"		/* remount part of a tree */
-#define	MNTOPT_RBIND	"rbind"		/* include subtrees */
-#define	MNTOPT_XATTR	"xattr"		/* enable extended attributes */
-#define	MNTOPT_NOXATTR	"noxattr"	/* disable extended attributes */
-#define	MNTOPT_COMMENT	"comment"	/* comment */
-#define	MNTOPT_ZFSUTIL	"zfsutil"	/* called by zfs utility */
-#define	MNTOPT_ACL	"acl"		/* passed by util-linux-2.24 mount */
-#define	MNTOPT_NOACL	"noacl"		/* likewise */
-#define	MNTOPT_POSIXACL	"posixacl"	/* likewise */
-
-#define	ZS_COMMENT	0x00000000	/* comment */
-#define	ZS_ZFSUTIL	0x00000001	/* caller is zfs(8) */
-
-#endif	/* _SYS_MNTENT_H */
diff --git a/lib/libspl/include/sys/mnttab.h b/lib/libspl/include/sys/mnttab.h
index 6bfbdd69c..21d89658c 100644
--- a/lib/libspl/include/sys/mnttab.h
+++ b/lib/libspl/include/sys/mnttab.h
@@ -39,7 +39,7 @@
 #endif /* MNTTAB */
 
 #define	MNTTAB		"/etc/mtab"
-#define	MNT_LINE_MAX	1024
+#define	MNT_LINE_MAX	4096
 
 #define	MNT_TOOLONG	1	/* entry exceeds MNT_LINE_MAX */
 #define	MNT_TOOMANY	2	/* too many fields in line */
diff --git a/lib/libspl/include/sys/mount.h b/lib/libspl/include/sys/mount.h
index 41cd839b7..ad1fa383e 100644
--- a/lib/libspl/include/sys/mount.h
+++ b/lib/libspl/include/sys/mount.h
@@ -29,7 +29,6 @@
 #ifndef _LIBSPL_SYS_MOUNT_H
 #define	_LIBSPL_SYS_MOUNT_H
 
-#include <sys/mntent.h>
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 6b67a73ef..088ee35c4 100644
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -1922,6 +1922,8 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
 		mnt.mnt_mntopts = zhp->zfs_mntopts;
 
 	switch (prop) {
+	case ZFS_PROP_ATIME:
+	case ZFS_PROP_RELATIME:
 	case ZFS_PROP_DEVICES:
 	case ZFS_PROP_EXEC:
 	case ZFS_PROP_READONLY:
@@ -1944,8 +1946,6 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
 		}
 		break;
 
-	case ZFS_PROP_ATIME:
-	case ZFS_PROP_RELATIME:
 	case ZFS_PROP_CANMOUNT:
 	case ZFS_PROP_VOLSIZE:
 	case ZFS_PROP_QUOTA: