Revert bdev.h to the way it was

Instead of re-defining MS_ options all over the place, just revert the
last change to bdev.h so we have all the defines in there again.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index 5b22248dfff245227136b0377edb0ee4a392c62b..29f4f21e0150f6f10fa562e3af21ad93195c9520 100644 (file)
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -62,14 +62,6 @@
 #define LO_FLAGS_AUTOCLEAR 4
 #endif
 
-#ifndef MS_REC
-#define MS_REC 16384
-#endif
-
-#ifndef MS_SLAVE
-#define MS_SLAVE (1<<19)
-#endif
-
 #define DEFAULT_FS_SIZE 1073741824
 #define DEFAULT_FSTYPE "ext3"
 

diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h
index 0907fb79cacef0a286387f00bd44c4fedb1dcd5a..c7d52af231e864acb4fcb186fbd1ea6833e6ee8e 100644 (file)
--- a/src/lxc/bdev.h
+++ b/src/lxc/bdev.h
@@ -32,6 +32,32 @@
 #include <stdint.h>
 #include <lxc/lxccontainer.h>
 
+
+/* define constants if the kernel/glibc headers don't define them */
+#ifndef MS_DIRSYNC
+#define MS_DIRSYNC  128
+#endif
+
+#ifndef MS_REC
+#define MS_REC 16384
+#endif
+
+#ifndef MNT_DETACH
+#define MNT_DETACH 2
+#endif
+
+#ifndef MS_SLAVE
+#define MS_SLAVE (1<<19)
+#endif
+
+#ifndef MS_RELATIME
+#define MS_RELATIME (1 << 21)
+#endif
+
+#ifndef MS_STRICTATIME
+#define MS_STRICTATIME (1 << 24)
+#endif
+
 struct bdev;
 
 struct bdev_ops {

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index ea90774e7c3e522eeb92b86c2c1100657ac05c63..d3d2d42c49165c6cc85ab47c53d6e3e07defe1fc 100644 (file)
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -55,10 +55,6 @@
 #include <mntent.h>
 #endif
 
-#ifndef MS_RELATIME
-#define MS_RELATIME (1<<21)
-#endif
-
 struct cgroup_hierarchy;
 struct cgroup_meta_data;
 struct cgroup_mount_point;