summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-21 16:14:08 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-11-21 16:14:08 (GMT)
commit102ff76c845746f9c0bae65299176a0a49f85260 (patch)
tree4718ea8cd5bdf8bf4d8eb7603f06e05234d03f16
parent85164fa06eac734dd853b7e08c1762ada06e9a2c (diff)
downloadbusybox-102ff76c845746f9c0bae65299176a0a49f85260.tar.gz
busybox-102ff76c845746f9c0bae65299176a0a49f85260.tar.bz2
mount: clean up #defines. No code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/mount.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 30037f9..271e691 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -19,6 +19,10 @@
#include <mntent.h>
#include <syslog.h>
#include <sys/mount.h>
+// Grab more as needed from util-linux's mount/mount_constants.h
+#ifndef MS_DIRSYNC
+# define MS_DIRSYNC (1 << 7) // Directory modifications are synchronous
+#endif
#ifndef MS_UNION
# define MS_UNION (1 << 8)
#endif
@@ -34,7 +38,7 @@
#ifndef MS_SILENT
# define MS_SILENT (1 << 15)
#endif
-/* The shared subtree stuff, which went in around 2.6.15. */
+// The shared subtree stuff, which went in around 2.6.15
#ifndef MS_UNBINDABLE
# define MS_UNBINDABLE (1 << 17)
#endif
@@ -50,8 +54,8 @@
#ifndef MS_RELATIME
# define MS_RELATIME (1 << 21)
#endif
-#include "libbb.h"
+#include "libbb.h"
#if ENABLE_FEATURE_MOUNT_LABEL
# include "volume_id.h"
#else
@@ -66,14 +70,6 @@
#include <rpc/pmap_prot.h>
#include <rpc/pmap_clnt.h>
-#ifndef MS_SILENT
-#define MS_SILENT (1 << 15)
-#endif
-// Grab more as needed from util-linux's mount/mount_constants.h
-#ifndef MS_DIRSYNC
-#define MS_DIRSYNC 128 // Directory modifications are synchronous
-#endif
-
#if defined(__dietlibc__)
// 16.12.2006, Sampo Kellomaki (sampo@iki.fi)