From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 16 Jun 2015 00:31:45 +0000 (+0000)
Subject: Update mount flags constants
X-Git-Tag: v4.11~503
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf7ee30c6b0ca145260fa88ba7284c165ece6694;p=strace

Update mount flags constants

* mount.c: Remove definitions of mount flags constants.
* xlat/mount_flags.in: Update from linux v4.0, add default values.
---

diff --git a/mount.c b/mount.c
index d980d75c..f5a927e7 100644
--- a/mount.c
+++ b/mount.c
@@ -1,34 +1,7 @@
 #include "defs.h"
 
-#define MS_RDONLY	 1	/* Mount read-only */
-#define MS_NOSUID	 2	/* Ignore suid and sgid bits */
-#define MS_NODEV	 4	/* Disallow access to device special files */
-#define MS_NOEXEC	 8	/* Disallow program execution */
-#define MS_SYNCHRONOUS	16	/* Writes are synced at once */
-#define MS_REMOUNT	32	/* Alter flags of a mounted FS */
-#define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */
-#define MS_DIRSYNC	128	/* Directory modifications are synchronous */
-#define MS_NOATIME	1024	/* Do not update access times. */
-#define MS_NODIRATIME	2048	/* Do not update directory access times */
-#define MS_BIND		4096
-#define MS_MOVE		8192
-#define MS_REC		16384
-#define MS_SILENT	32768
-#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
-#define MS_UNBINDABLE	(1<<17)	/* change to unbindable */
-#define MS_PRIVATE	(1<<18)	/* change to private */
-#define MS_SLAVE	(1<<19)	/* change to slave */
-#define MS_SHARED	(1<<20)	/* change to shared */
-#define MS_RELATIME	(1<<21)
-#define MS_KERNMOUNT	(1<<22)
-#define MS_I_VERSION	(1<<23)
-#define MS_STRICTATIME	(1<<24)
-#define MS_NOSEC	(1<<28)
-#define MS_BORN		(1<<29)
-#define MS_ACTIVE	(1<<30)
-#define MS_NOUSER	(1<<31)
-#define MS_MGC_VAL	0xc0ed0000	/* Magic flag number */
-#define MS_MGC_MSK	0xffff0000	/* Magic flag mask */
+#define MS_MGC_VAL	0xc0ed0000	/* old magic mount flag number */
+#define MS_MGC_MSK	0xffff0000	/* old magic mount flag mask */
 
 #include "xlat/mount_flags.h"
 
diff --git a/xlat/mount_flags.in b/xlat/mount_flags.in
index 8e72e58f..fbb2a717 100644
--- a/xlat/mount_flags.in
+++ b/xlat/mount_flags.in
@@ -1,27 +1,28 @@
-MS_MGC_VAL
-MS_RDONLY
-MS_NOSUID
-MS_NODEV
-MS_NOEXEC
-MS_SYNCHRONOUS
-MS_REMOUNT
-MS_RELATIME
-MS_KERNMOUNT
-MS_I_VERSION
-MS_STRICTATIME
-MS_NOSEC
-MS_BORN
-MS_MANDLOCK
-MS_NOATIME
-MS_NODIRATIME
-MS_BIND
-MS_MOVE
-MS_REC
-MS_SILENT
-MS_POSIXACL
-MS_UNBINDABLE
-MS_PRIVATE
-MS_SLAVE
-MS_SHARED
-MS_ACTIVE
-MS_NOUSER
+MS_RDONLY	1
+MS_NOSUID	2
+MS_NODEV	4
+MS_NOEXEC	8
+MS_SYNCHRONOUS	16
+MS_REMOUNT	32
+MS_MANDLOCK	64
+MS_DIRSYNC	128
+MS_NOATIME	1024
+MS_NODIRATIME	2048
+MS_BIND		4096
+MS_MOVE		8192
+MS_REC		16384
+MS_SILENT	32768
+MS_POSIXACL	(1<<16)
+MS_UNBINDABLE	(1<<17)
+MS_PRIVATE	(1<<18)
+MS_SLAVE	(1<<19)
+MS_SHARED	(1<<20)
+MS_RELATIME	(1<<21)
+MS_KERNMOUNT	(1<<22)
+MS_I_VERSION	(1<<23)
+MS_STRICTATIME	(1<<24)
+MS_LAZYTIME	(1<<25)
+MS_NOSEC	(1<<28)
+MS_BORN		(1<<29)
+MS_ACTIVE	(1<<30)
+MS_NOUSER	(1<<31)