From: Zach Brown <zab@redhat.com>
Date: Wed, 14 Aug 2013 23:16:43 +0000 (-0700)
Subject: btrfs-progs: don't use <linux/fs.h>
X-Git-Tag: upstream/4.16.1~3169
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a505d6c583bf68b47ba6d8e8ccbb42f76060e72;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: don't use <linux/fs.h>

sparse can freak out when <linux/fs.h> is included because it redefines
approximately a gazillion symbols already found in <sys/mount.h>:

/usr/include/linux/fs.h:203:9: warning: preprocessor token MS_RDONLY redefined
/usr/include/sys/mount.h:37:9: this was the original definition

Happily, we don't actually need to include the low-level <linux/fs.h>
for anything.  One assumes it was just carried over from kernel space.

Signed-off-by: Zach Brown <zab@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
---

diff --git a/btrfs-convert.c b/btrfs-convert.c
index 828f361..a1fb645 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -31,7 +31,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <uuid/uuid.h>
-#include <linux/fs.h>
 
 #include "ctree.h"
 #include "disk-io.h"
diff --git a/mkfs.c b/mkfs.c
index 6f9a160..5f8d8b5 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <uuid/uuid.h>
-#include <linux/fs.h>
 #include <ctype.h>
 #include <attr/xattr.h>
 #include <blkid/blkid.h>