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 df6ac369dc10880f3f18f72808070b1dc084f331..602ece8961717ce6c675c9b9af4b2bf72763b01e 100644 (file)
--- 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 2af2675f5f260c6d0ab5afe9ac14888b92d36f37..46f15d6c12ebe38a7cca68e91a6558c0f496063e 100644 (file)
--- 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>