Update bcachefs sources to f9c612bbf82d bcachefs: Fixes for building in userspace

[bcachefs-tools-debian] / libbcachefs / btree_types.h

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index 71ad3893e83d0546f4ccac93e4b12585cb8f0018..67ecb5e4e57e6bad2415d498d4a08d0bbf71589c 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -194,34 +194,34 @@ struct btree_node_iter {
 /*
  * Iterate over all possible positions, synthesizing deleted keys for holes:
  */
-static const u16 BTREE_ITER_SLOTS              = 1 << 0;
-static const u16 BTREE_ITER_ALL_LEVELS         = 1 << 1;
+static const __maybe_unused u16 BTREE_ITER_SLOTS               = 1 << 0;
+static const __maybe_unused u16 BTREE_ITER_ALL_LEVELS          = 1 << 1;
 /*
  * Indicates that intent locks should be taken on leaf nodes, because we expect
  * to be doing updates:
  */
-static const u16 BTREE_ITER_INTENT             = 1 << 2;
+static const __maybe_unused u16 BTREE_ITER_INTENT              = 1 << 2;
 /*
  * Causes the btree iterator code to prefetch additional btree nodes from disk:
  */
-static const u16 BTREE_ITER_PREFETCH           = 1 << 3;
+static const __maybe_unused u16 BTREE_ITER_PREFETCH            = 1 << 3;
 /*
  * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for
  * @pos or the first key strictly greater than @pos
  */
-static const u16 BTREE_ITER_IS_EXTENTS         = 1 << 4;
-static const u16 BTREE_ITER_NOT_EXTENTS                = 1 << 5;
-static const u16 BTREE_ITER_CACHED             = 1 << 6;
-static const u16 BTREE_ITER_WITH_KEY_CACHE     = 1 << 7;
-static const u16 BTREE_ITER_WITH_UPDATES       = 1 << 8;
-static const u16 BTREE_ITER_WITH_JOURNAL       = 1 << 9;
-static const u16 __BTREE_ITER_ALL_SNAPSHOTS    = 1 << 10;
-static const u16 BTREE_ITER_ALL_SNAPSHOTS      = 1 << 11;
-static const u16 BTREE_ITER_FILTER_SNAPSHOTS   = 1 << 12;
-static const u16 BTREE_ITER_NOPRESERVE         = 1 << 13;
-static const u16 BTREE_ITER_CACHED_NOFILL      = 1 << 14;
-static const u16 BTREE_ITER_KEY_CACHE_FILL     = 1 << 15;
-#define __BTREE_ITER_FLAGS_END                        16
+static const __maybe_unused u16 BTREE_ITER_IS_EXTENTS          = 1 << 4;
+static const __maybe_unused u16 BTREE_ITER_NOT_EXTENTS         = 1 << 5;
+static const __maybe_unused u16 BTREE_ITER_CACHED              = 1 << 6;
+static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE      = 1 << 7;
+static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES                = 1 << 8;
+static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL                = 1 << 9;
+static const __maybe_unused u16 __BTREE_ITER_ALL_SNAPSHOTS     = 1 << 10;
+static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS       = 1 << 11;
+static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS    = 1 << 12;
+static const __maybe_unused u16 BTREE_ITER_NOPRESERVE          = 1 << 13;
+static const __maybe_unused u16 BTREE_ITER_CACHED_NOFILL       = 1 << 14;
+static const __maybe_unused u16 BTREE_ITER_KEY_CACHE_FILL      = 1 << 15;
+#define __BTREE_ITER_FLAGS_END                                        16
 
 enum btree_path_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -459,8 +459,8 @@ struct btree_trans {
        void                    *mem;
 
        u8                      sorted[BTREE_ITER_MAX + 8];
-       struct btree_path       *paths;
-       struct btree_insert_entry *updates;
+       struct btree_path       paths[BTREE_ITER_MAX];
+       struct btree_insert_entry updates[BTREE_ITER_MAX];
        struct btree_write_buffered_key *wb_updates;
 
        /* update path: */