From: Nikita Ofitserov <[email protected]> The new name (btree_type_has_data_ptrs) better reflects the meaning. Also introduce the explicit mask constant.
Signed-off-by: Nikita Ofitserov <[email protected]> --- fs/bcachefs/backpointers.c | 2 +- fs/bcachefs/btree_gc.c | 2 +- fs/bcachefs/btree_types.h | 8 ++++---- fs/bcachefs/migrate.c | 2 +- fs/bcachefs/move.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/bcachefs/backpointers.c b/fs/bcachefs/backpointers.c index cb25cddb759b84bed48c653605ba195218f2140c..0d585e5662be3f02580558e9a590075ea73193d5 100644 --- a/fs/bcachefs/backpointers.c +++ b/fs/bcachefs/backpointers.c @@ -809,7 +809,7 @@ static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans, for (enum btree_id btree_id = 0; btree_id < btree_id_nr_alive(c); btree_id++) { - int level, depth = btree_type_has_ptrs(btree_id) ? 0 : 1; + int level, depth = btree_type_has_data_ptrs(btree_id) ? 0 : 1; ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc, diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index b95a3610900de2eecf978c62f3809453455f7a5c..2338feb8d8ed4bad85a01a6b9181116d918636b5 100644 --- a/fs/bcachefs/btree_gc.c +++ b/fs/bcachefs/btree_gc.c @@ -1238,7 +1238,7 @@ int bch2_gc_gens(struct bch_fs *c) } for (unsigned i = 0; i < BTREE_ID_NR; i++) - if (btree_type_has_ptrs(i)) { + if (btree_type_has_data_ptrs(i)) { c->gc_gens_btree = i; c->gc_gens_pos = POS_MIN; diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h index ad9bd18fe9b6e51987da74d373830dca98df56ec..d06991c16d5c24c586e9449efa9553e2b8593bd4 100644 --- a/fs/bcachefs/btree_types.h +++ b/fs/bcachefs/btree_types.h @@ -886,15 +886,15 @@ static inline bool btree_type_has_snapshot_field(enum btree_id btree) return BIT_ULL(btree) & mask; } -static inline bool btree_type_has_ptrs(enum btree_id btree) -{ - const u64 mask = 0 +static const u64 btree_has_data_ptrs_mask = 0 #define x(name, nr, flags, ...) |((!!((flags) & BTREE_IS_data)) << nr) BCH_BTREE_IDS() #undef x ; - return BIT_ULL(btree) & mask; +static inline bool btree_type_has_data_ptrs(enum btree_id btree) +{ + return BIT_ULL(btree) & btree_has_data_ptrs_mask; } static inline bool btree_type_uses_write_buffer(enum btree_id btree) diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 892990b4a6a6b16785e5030e5dc7cf15b05c0fc5..41657deb0e3807f4968272491faea09d05ec2299 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -122,7 +122,7 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, CLASS(btree_trans, trans)(c); for (unsigned id = 0; id < BTREE_ID_NR; id++) { - if (!btree_type_has_ptrs(id)) + if (!btree_type_has_data_ptrs(id)) continue; /* Stripe keys have pointers, but are handled separately */ diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 4f41f1f6ec6c7fe6af663e11b3479fde02832ef9..1cd81380c7d87ebc446a874f2f4a208442d0c577 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -820,7 +820,7 @@ static int bch2_move_data(struct bch_fs *c, unsigned min_depth_this_btree = min_depth; /* Stripe keys have pointers, but are handled separately */ - if (!btree_type_has_ptrs(id) || + if (!btree_type_has_data_ptrs(id) || id == BTREE_ID_stripes) min_depth_this_btree = max(min_depth_this_btree, 1); -- 2.50.1
