btrfs-progs: build: add missing defines for the C=1 build

[platform/upstream/btrfs-progs.git] / extent_io.h

diff --git a/extent_io.h b/extent_io.h
index 94a42bf..e617489 100644 (file)
--- a/extent_io.h
+++ b/extent_io.h
@@ -29,25 +29,25 @@
 #include <btrfs/list.h>
 #endif /* BTRFS_FLAT_INCLUDES */
 
-#define EXTENT_DIRTY 1
-#define EXTENT_WRITEBACK (1 << 1)
-#define EXTENT_UPTODATE (1 << 2)
-#define EXTENT_LOCKED (1 << 3)
-#define EXTENT_NEW (1 << 4)
-#define EXTENT_DELALLOC (1 << 5)
-#define EXTENT_DEFRAG (1 << 6)
-#define EXTENT_DEFRAG_DONE (1 << 7)
-#define EXTENT_BUFFER_FILLED (1 << 8)
-#define EXTENT_CSUM (1 << 9)
-#define EXTENT_BAD_TRANSID (1 << 10)
-#define EXTENT_BUFFER_DUMMY (1 << 11)
+#define EXTENT_DIRTY           (1U << 0)
+#define EXTENT_WRITEBACK       (1U << 1)
+#define EXTENT_UPTODATE                (1U << 2)
+#define EXTENT_LOCKED          (1U << 3)
+#define EXTENT_NEW             (1U << 4)
+#define EXTENT_DELALLOC                (1U << 5)
+#define EXTENT_DEFRAG          (1U << 6)
+#define EXTENT_DEFRAG_DONE     (1U << 7)
+#define EXTENT_BUFFER_FILLED   (1U << 8)
+#define EXTENT_CSUM            (1U << 9)
+#define EXTENT_BAD_TRANSID     (1U << 10)
+#define EXTENT_BUFFER_DUMMY    (1U << 11)
 #define EXTENT_IOBITS (EXTENT_LOCKED | EXTENT_WRITEBACK)
 
-#define BLOCK_GROUP_DATA     EXTENT_WRITEBACK
-#define BLOCK_GROUP_METADATA EXTENT_UPTODATE
-#define BLOCK_GROUP_SYSTEM   EXTENT_NEW
+#define BLOCK_GROUP_DATA       (1U << 1)
+#define BLOCK_GROUP_METADATA   (1U << 2)
+#define BLOCK_GROUP_SYSTEM     (1U << 4)
 
-#define BLOCK_GROUP_DIRTY EXTENT_DIRTY
+#define BLOCK_GROUP_DIRTY      (1U)
 
 /*
  * The extent buffer bitmap operations are done with byte granularity instead of
@@ -95,9 +95,9 @@ struct extent_buffer {
        struct list_head lru;
        struct list_head recow;
        int refs;
-       int flags;
+       u32 flags;
        int fd;
-       char data[];
+       char data[] __attribute__((aligned(8)));
 };
 
 static inline void extent_buffer_get(struct extent_buffer *eb)
@@ -107,26 +107,21 @@ static inline void extent_buffer_get(struct extent_buffer *eb)
 
 void extent_io_tree_init(struct extent_io_tree *tree);
 void extent_io_tree_cleanup(struct extent_io_tree *tree);
-int set_extent_bits(struct extent_io_tree *tree, u64 start,
-                   u64 end, int bits, gfp_t mask);
-int clear_extent_bits(struct extent_io_tree *tree, u64 start,
-                     u64 end, int bits, gfp_t mask);
+int set_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits);
+int clear_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits);
 int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
                          u64 *start_ret, u64 *end_ret, int bits);
 int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end,
                   int bits, int filled);
-int set_extent_dirty(struct extent_io_tree *tree, u64 start,
-                    u64 end, gfp_t mask);
-int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
-                      u64 end, gfp_t mask);
+int set_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end);
+int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end);
 static inline int set_extent_buffer_uptodate(struct extent_buffer *eb)
 {
        eb->flags |= EXTENT_UPTODATE;
        return 0;
 }
 
-static inline int clear_extent_buffer_uptodate(struct extent_io_tree *tree,
-                               struct extent_buffer *eb)
+static inline int clear_extent_buffer_uptodate(struct extent_buffer *eb)
 {
        eb->flags &= ~EXTENT_UPTODATE;
        return 0;