From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Thu, 22 Mar 2018 14:05:17 +0100
Subject: libmount: include sys/mount.h only if necessary

Addresses: https://github.com/systemd/systemd/issues/8507
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 sys-utils/fstrim.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 53ac594c0..ce52063e1 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -35,6 +35,7 @@
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <linux/fs.h>
 
 #include "nls.h"
 #include "strutils.h"
@@ -46,9 +47,6 @@
 #include <libmount.h>
 
 
-/* We cannot include linux/fs.h due to MS_* constants collision with
- * sys/mount.h (and libmount.h)
- */
 #ifndef FITRIM
 struct fstrim_range {
 	uint64_t start;
-- 
cgit v1.2.3-55-g7522