From: Eric Sandeen <sandeen@redhat.com>
Date: Tue, 9 Oct 2018 16:49:47 +0000 (-0500)
Subject: libxfs: avoid redefinitions of macros in mount.h
X-Git-Tag: v4.19.0-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e4109b8b9ac4afd4aca1042db1a6761868107d2;p=thirdparty%2Fxfsprogs-dev.git

libxfs: avoid redefinitions of macros in mount.h

MS_* (MS_NOSUID ... etc) get redefined in <sys/mount.h> after we include
<linux/fs.h>, at least on my fairly old set of headers.  Fix this by
simply removing the inclusion of mount.h, which isn't needed.

Fixes sparse warnings about this.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/io/label.c b/io/label.c
index df6ac369d..602ece896 100644
--- a/io/label.c
+++ b/io/label.c
@@ -4,7 +4,6 @@
  */
 
 #include <sys/ioctl.h>
-#include <sys/mount.h>
 #include "platform_defs.h"
 #include "libxfs.h"
 #include "path.h"
diff --git a/libfrog/linux.c b/libfrog/linux.c
index 2af2675f5..46f15d6c1 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -6,7 +6,6 @@
 
 #include <mntent.h>
 #include <sys/stat.h>
-#include <sys/mount.h>
 #include <sys/ioctl.h>
 #include <sys/sysinfo.h>