btrfs-progs: library: distribute sizes.h, fix build

The patch "btrfs-progs: Introduce kernel sizes to cleanup large
intermediate number" (a2203246ae483d09) was taken from kernel but not
properly ported so the build breaks because the header linux/sizes.h is
not exported.

The build tests of library do not cover the case when the macro
BTRFS_FLAT_INCLUDES is not defined (ie. an external build).

Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/Makefile b/Makefile
index 67fbc48..12f6db7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
                   uuid-tree.o utils-lib.o rbtree-utils.o
 libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
               kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
-              kernel-lib/radix-tree.h extent-cache.h \
+              kernel-lib/radix-tree.h kernel-lib/sizes.h extent-cache.h \
               extent_io.h ioctl.h ctree.h btrfsck.h version.h
 convert_objects = convert/main.o convert/common.o convert/source-fs.o \
                  convert/source-ext2.o

diff --git a/ctree.h b/ctree.h
index 91d5555..13cf3b0 100644 (file)
--- a/ctree.h
+++ b/ctree.h
@@ -34,7 +34,7 @@
 #include <btrfs/extent-cache.h>
 #include <btrfs/extent_io.h>
 #include <btrfs/ioctl.h>
-#include <linux/sizes.h>
+#include <btrfs/sizes.h>
 #endif /* BTRFS_FLAT_INCLUDES */
 
 struct btrfs_root;