# see: https://github.com/karelzak/systemd/commit/eb50b6d936c474f5bc2974c059f6432222af4de4

Fix linux/fs.h and sys/mount.h collisions
* (kernel-headers) linux/fs.h and (glibc) sys/mount.h contains MS_* constants
  and because it's without #ifdefs you cannot include the both files together
  in the same code

* (systemd) src/basic/missing.h contains another copy of MS_* constants

The patch removes local systemd MS_* fallbacks, cleanup fs.h and
mount.h include.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff -Naur systemd-238/src/basic/missing.h systemd-238-util-linux-232/src/basic/missing.h
--- systemd-238/src/basic/missing.h	2018-03-05 23:16:37.000000000 +0100
+++ systemd-238-util-linux-232/src/basic/missing.h	2018-06-13 17:28:21.192155047 +0200
@@ -524,46 +524,6 @@
 #define OCFS2_SUPER_MAGIC 0x7461636f
 #endif
 
-#ifndef MS_MOVE
-#define MS_MOVE 8192
-#endif
-
-#ifndef MS_REC
-#define MS_REC 16384
-#endif
-
-#ifndef MS_PRIVATE
-#define MS_PRIVATE      (1<<18)
-#endif
-
-#ifndef MS_REC
-#define MS_REC          (1<<19)
-#endif
-
-#ifndef MS_SHARED
-#define MS_SHARED       (1<<20)
-#endif
-
-#ifndef MS_RELATIME
-#define MS_RELATIME     (1<<21)
-#endif
-
-#ifndef MS_KERNMOUNT
-#define MS_KERNMOUNT    (1<<22)
-#endif
-
-#ifndef MS_I_VERSION
-#define MS_I_VERSION    (1<<23)
-#endif
-
-#ifndef MS_STRICTATIME
-#define MS_STRICTATIME  (1<<24)
-#endif
-
-#ifndef MS_LAZYTIME
-#define MS_LAZYTIME     (1<<25)
-#endif
-
 #ifndef SCM_SECURITY
 #define SCM_SECURITY 0x03
 #endif
diff -Naur systemd-238/src/core/load-fragment.c systemd-238-util-linux-232/src/core/load-fragment.c
--- systemd-238/src/core/load-fragment.c	2018-03-05 23:16:37.000000000 +0100
+++ systemd-238-util-linux-232/src/core/load-fragment.c	2018-06-13 17:29:04.915617706 +0200
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/fs.h>
 #include <linux/oom.h>
 #if HAVE_SECCOMP
 #include <seccomp.h>
diff -Naur systemd-238/src/shared/bus-unit-util.c systemd-238-util-linux-232/src/shared/bus-unit-util.c
--- systemd-238/src/shared/bus-unit-util.c	2018-03-05 23:16:37.000000000 +0100
+++ systemd-238-util-linux-232/src/shared/bus-unit-util.c	2018-06-13 17:29:55.999987322 +0200
@@ -52,6 +52,8 @@
 #include "utf8.h"
 #include "util.h"
 
+#include <sys/mount.h>
+
 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
         assert(message);
         assert(u);