summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Brown <zab@redhat.com>2013-08-14 16:16:43 -0700
committerDavid Sterba <dsterba@suse.cz>2013-09-03 19:41:10 +0200
commit2a505d6c583bf68b47ba6d8e8ccbb42f76060e72 (patch)
treec5d56c5aabdc3a92676f1dfe49ab4a5b0a6403ff
parent1eb159a295261c56d14b962eb3d4763f8ce38807 (diff)
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>
-rw-r--r--btrfs-convert.c1
-rw-r--r--mkfs.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c
index 828f3616..a1fb6456 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 6f9a160f..5f8d8b5a 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>