git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3.10 API change: block_device_operations->release() returns void
[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
d4ac6a9
..
7b1e06b
100644
(file)
--- a/
lib/libspl/include/sys/mount.h
+++ b/
lib/libspl/include/sys/mount.h
@@
-51,10
+51,10
@@
#define MS_DIRSYNC S_WRITE
#endif
#define MS_DIRSYNC S_WRITE
#endif
-#define MS_USERS
0x40000000
-#define MS_OWNER
0x10000000
-#define MS_GROUP
0x08000000
-#define MS_COMMENT 0
x02000000
+#define MS_USERS
(MS_NOEXEC|MS_NOSUID|MS_NODEV)
+#define MS_OWNER
(MS_NOSUID|MS_NODEV)
+#define MS_GROUP
(MS_NOSUID|MS_NODEV)
+#define MS_COMMENT 0
/*
* Older glibc <sys/mount.h> headers did not define all the available
/*
* Older glibc <sys/mount.h> headers did not define all the available
@@
-73,4
+73,11
@@
# define MS_DETACH 0x00000002
#endif /* MNT_DETACH */
# define MS_DETACH 0x00000002
#endif /* MNT_DETACH */
+/*
+ * Overlay mount is default in Linux, but for solaris/zfs
+ * compatibility, MS_OVERLAY is defined to explicitly have the user
+ * provide a flag (-O) to mount over a non empty directory.
+ */
+#define MS_OVERLAY 0x00000004
+
#endif /* _LIBSPL_SYS_MOUNT_H */
#endif /* _LIBSPL_SYS_MOUNT_H */