From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Aug 2013 08:12:35 +0000 (+0200)
Subject: missing: use btrfs.h instead of defining our own btrfs structures
X-Git-Tag: v207~152
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bed2e820dba48591853547547a46ba4de04f86ad

missing: use btrfs.h instead of defining our own btrfs structures
---

diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
index ccd8408c1..658c230d6 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -38,6 +38,7 @@
 #include <sys/mman.h>
 #include <linux/fs.h>
 #include <linux/fiemap.h>
+#include <linux/btrfs.h>
 #include <sys/ioctl.h>
 #include <sys/vfs.h>
 #include <getopt.h>
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 534b3ccd4..6e4b398fc 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -154,23 +154,6 @@ static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t ma
 }
 #endif
 
-#ifndef BTRFS_IOCTL_MAGIC
-#define BTRFS_IOCTL_MAGIC 0x94
-#endif
-
-#ifndef BTRFS_PATH_NAME_MAX
-#define BTRFS_PATH_NAME_MAX 4087
-#endif
-
-struct btrfs_ioctl_vol_args {
-        int64_t fd;
-        char name[BTRFS_PATH_NAME_MAX + 1];
-};
-
-#ifndef BTRFS_IOC_DEFRAG
-#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, struct btrfs_ioctl_vol_args)
-#endif
-
 #ifndef BTRFS_SUPER_MAGIC
 #define BTRFS_SUPER_MAGIC 0x9123683E
 #endif