From a0357292b5faca0383ea13626d0564d4da275b06 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 20 Mar 2018 11:42:34 +0100
Subject: fstrim: fix fs.h and mount.h collision

Unfortunately, old version of the file linux/fs.h defines MS_*
macros, so the file cannot be included together with sys/mount.h.

We include sys/mount.h from libmount.h now.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 sys-utils/fstrim.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sys-utils/fstrim.c')

diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 98708d533..ca8cf256d 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -35,7 +35,10 @@
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <linux/fs.h>
+
+#ifdef HAVE_SYS_FS_H
+# include <linux/fs.h>
+#endif
 
 #include "nls.h"
 #include "strutils.h"
-- 
cgit v1.2.3-55-g7522