X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=lib%2Flibspl%2Finclude%2Fsys%2Fmntent.h;h=8fad65b56f86a3affe605fa6cf27d7a3bdfba4ff;hb=756c3e5a9ce36461939a8dc421918e1c3a379fa6;hp=d552c9c17955ec825b274b31bbf1d36cb5715857;hpb=3fb1fcdea167d705e050a0383ec61b95fbe8a0ed;p=zfs.git

diff --git a/lib/libspl/include/sys/mntent.h b/lib/libspl/include/sys/mntent.h
index d552c9c..8fad65b 100644
--- a/lib/libspl/include/sys/mntent.h
+++ b/lib/libspl/include/sys/mntent.h
@@ -31,9 +31,6 @@
 
 #define	MNTTYPE_ZFS	"zfs"		/* ZFS file system */
 
-#define	FSTAB		"/etc/fstab"
-#define	MNTMAXSTR	128
-
 #define	MOUNT_SUCCESS	0x00		/* Success */
 #define	MOUNT_USAGE	0x01		/* Invalid invocation or permissions */
 #define	MOUNT_SYSERR	0x02		/* System error (ENOMEM, etc) */
@@ -49,6 +46,7 @@
 #define	MNTOPT_AUTO	"auto"		/* automount */
 #define	MNTOPT_NOAUTO	"noauto"	/* do not automount */
 #define	MNTOPT_CONTEXT	"context"	/* selinux context */
+#define	MNTOPT_NOCONTEXT "nocontext"	/* No selinux context (zfs-only) */
 #define	MNTOPT_FSCONTEXT "fscontext"	/* selinux fscontext */
 #define	MNTOPT_DEFCONTEXT "defcontext"	/* selinux defcontext */
 #define	MNTOPT_ROOTCONTEXT "rootcontext" /* selinux rootcontext */
@@ -90,13 +88,13 @@
 #define	MNTOPT_LOUD	"loud"		/* verbose mount */
 #define	MNTOPT_BIND	"bind"		/* remount part of a tree */
 #define	MNTOPT_RBIND	"rbind"		/* include subtrees */
-#define	MNTOPT_XATTR	"user_xattr"	/* enable extended attributes */
-#define	MNTOPT_NOXATTR	"nouser_xattr"	/* disable extended attributes */
+#define	MNTOPT_XATTR	"xattr"		/* enable extended attributes */
+#define	MNTOPT_NOXATTR	"noxattr"	/* disable extended attributes */
 #define	MNTOPT_COMMENT	"comment"	/* comment */
-#define	MNTOPT_BOOTWAIT	"bootwait"
-#define	MNTOPT_NOBOOTWAIT "nobootwait"
-#define	MNTOPT_OPTIONAL	"optional"
-#define	MNTOPT_SHOWTHROUGH "showthrough"
 #define	MNTOPT_ZFSUTIL	"zfsutil"	/* called by zfs utility */
 
+#define ZS_COMMENT	0x00000000	/* comment */
+#define ZS_ZFSUTIL	0x00000001	/* caller is zfs(8) */
+#define ZS_NOCONTEXT	0x00000002	/* do not add selinux context */
+
 #endif	/* _SYS_MNTENT_H */