[lxc-devel] [lxc/master] macro: move MS_* macros

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180902/75163658/attachment.bin>
-------------- next part --------------
From 6e5655e0db314259faa67e5ac5bb373703caad66 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Sun, 2 Sep 2018 07:32:23 +0200
Subject: [PATCH] macro: move MS_* macros

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/conf.c  |  9 +--------
 src/lxc/macro.h | 12 ++++++++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 636748a50..52fc49c91 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -101,6 +101,7 @@
 #include "lsm/lsm.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
+#include "macro.h"
 #include "namespace.h"
 #include "network.h"
 #include "parse.h"
@@ -111,14 +112,6 @@
 #include "terminal.h"
 #include "utils.h"
 
-#ifndef MS_PRIVATE
-#define MS_PRIVATE (1<<18)
-#endif
-
-#ifndef MS_LAZYTIME
-#define MS_LAZYTIME (1<<25)
-#endif
-
 lxc_log_define(conf, lxc);
 
 /* The lxc_conf of the container currently being worked on in an API call.
diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 8c8c91a6e..d44e2f9b1 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -303,14 +303,22 @@ extern int __build_bug_on_failed;
 #define LXC_AUDS_ADDR_LEN sizeof(((struct sockaddr_un *)0)->sun_path)
 
 /* mount */
-#ifndef MS_REC
-#define MS_REC 16384
+#ifndef MS_PRIVATE
+#define MS_PRIVATE (1<<18)
 #endif
 
 #ifndef MS_SLAVE
 #define MS_SLAVE (1 << 19)
 #endif
 
+#ifndef MS_LAZYTIME
+#define MS_LAZYTIME (1<<25)
+#endif
+
+#ifndef MS_REC
+#define MS_REC 16384
+#endif
+
 /* open */
 #ifndef O_PATH
 #define O_PATH      010000000