[PATCH 04/12] bcachefs: Introduce btree_leaf_has_triggers_mask

[Nikita Ofitserov via B4 Relay]

From: Nikita Ofitserov <himi...@gmail.com>

Signed-off-by: Nikita Ofitserov <himi...@gmail.com>
---
 fs/bcachefs/btree_gc.c    | 2 +-
 fs/bcachefs/btree_types.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 
43f294284d57473fd8868c974c4bdd847fcf2636..2b1b6b7ffdf0af7ec0bf4cbaf68cc9a53a20cfce
 100644
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -720,7 +720,7 @@ static int bch2_gc_btree(struct btree_trans *trans,
                         enum btree_id btree, bool initial)
 {
        struct bch_fs *c = trans->c;
-       unsigned target_depth = 
btree_node_type_has_triggers(__btree_node_type(0, btree)) ? 0 : 1;
+       unsigned target_depth = BIT_ULL(btree) & btree_leaf_has_triggers_mask ? 
0 : 1;
        int ret = 0;
 
        /* We need to make sure every leaf node is readable before going RW */
diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h
index 
e893eb938bb3da441f0ab0096ced3cc3c2a701e2..ad9bd18fe9b6e51987da74d373830dca98df56ec
 100644
--- a/fs/bcachefs/btree_types.h
+++ b/fs/bcachefs/btree_types.h
@@ -840,6 +840,9 @@ static inline bool btree_node_type_has_triggers(enum 
btree_node_type type)
        return BIT_ULL(type) & BTREE_NODE_TYPE_HAS_TRIGGERS;
 }
 
+/* A mask of btree id bits that have triggers for their leaves */
+static const u64 btree_leaf_has_triggers_mask = BTREE_NODE_TYPE_HAS_TRIGGERS 
>> 1;
+
 static const u64 btree_is_extents_mask = 0
 #define x(name, nr, flags, ...)        |((!!((flags) & BTREE_IS_extents)) << 
nr)
 BCH_BTREE_IDS()

-- 
2.50.1