Merge branch 'zpl'

[zfs.git] / lib / libspl / include / sys / mount.h

diff --git a/lib/libspl/include/sys/mount.h b/lib/libspl/include/sys/mount.h
index 144f915..9eb893f 100644 (file)
--- a/lib/libspl/include/sys/mount.h
+++ b/lib/libspl/include/sys/mount.h
@@ -42,9 +42,20 @@
 #define BLKGETSIZE64           _IOR(0x12, 114, size_t)
 #endif
 
-#define MS_FORCE               MNT_FORCE
-#define MS_OVERLAY             32768
-#define MS_NOMNTTAB            0         /* Not supported in Linux */
-#define MS_OPTIONSTR           0         /* Not necessary in Linux */
+/*
+ * Some old glibc headers don't correctly define MS_DIRSYNC and
+ * instead use the enum name S_WRITE.  When using these older
+ * headers define MS_DIRSYNC to be S_WRITE.
+ */
+#if !defined(MS_DIRSYNC)
+#define MS_DIRSYNC             S_WRITE
+#endif
+
+#define        MS_USERS        0x40000000
+#define        MS_OWNER        0x10000000
+#define        MS_GROUP        0x08000000
+#define        MS_COMMENT      0x02000000
+#define        MS_FORCE        MNT_FORCE
+#define        MS_DETACH       MNT_DETACH
 
 #endif /* _LIBSPL_SYS_MOUNT_H */