bcachefs: Kill BTREE_TRIGGER_bucket_invalidate
PATCH 1/1 bcachefs: Kill BTREE_TRIGGER_bucket_invalidate
Signed-off-by Alan Huang <[email protected]>
--- fs/bcachefs/alloc_background.c | 9 --------- fs/bcachefs/btree_types.h | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-)
fs/bcachefs/alloc_background.c +0 -9
@@ -914,15 +914,6 @@ int bch2_trigger_alloc(struct btree_trans *trans, goto err; } -if ((flags & BTREE_TRIGGER_bucket_invalidate) && - old_a->cached_sectors) { - ret =bch2_mod_dev_cached_sectors (trans, ca->dev_idx, - -((s64 ) old_a->cached_sectors), - flags & BTREE_TRIGGER_gc); -if (ret) - goto err; - } - ret =bch2_alloc_key_to_dev_counters (trans, ca, old_a, new_a, flags);if (ret) goto err;
fs/bcachefs/btree_types.h +1 -5
@@ -258,9 +258,6 @@ struct btree_node_iter {* * BTREE_TRIGGER_insert - @new is entering the btree * BTREE_TRIGGER_overwrite - @old is leaving the btree -* -* BTREE_TRIGGER_bucket_invalidate - signal from bucket invalidate path to alloc -* trigger */ #define BTREE_TRIGGER_FLAGS () \ x(norun) \
@@ -270,8 +267,7 @@ struct btree_node_iter {x (gc) \x (insert ) \x (overwrite) \ -x (is_root) \ -x (bucket_invalidate) +x (is_root) enum {#define x (n) BTREE_ITER_FLAG_BIT_##n,
Signature · 1 line
2.48.1
Kent Overstreet
AppliedQuoted 1 line · Alan Huang
Signed-off-by Alan Huang <[email protected]>
Applied
Quoted 52 lines
--- fs/bcachefs/alloc_background.c | 9 --------- fs/bcachefs/btree_types.h | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-)fs/bcachefs/alloc_background.c +0
-9@@ -914,15 +914,6 @@ int bch2_trigger_alloc(struct btree_trans *trans, goto err; } -if ((flags & BTREE_TRIGGER_bucket_invalidate) && - old_a->cached_sectors) { - ret =bch2_mod_dev_cached_sectors (trans, ca->dev_idx, - -((s64 ) old_a->cached_sectors), - flags & BTREE_TRIGGER_gc); -if (ret) - goto err; - } - ret =bch2_alloc_key_to_dev_counters (trans, ca, old_a, new_a, flags);if (ret) goto err;fs/bcachefs/btree_types.h +1
-5@@ -258,9 +258,6 @@ struct btree_node_iter {* * BTREE_TRIGGER_insert - @new is entering the btree * BTREE_TRIGGER_overwrite - @old is leaving the btree -* -* BTREE_TRIGGER_bucket_invalidate - signal from bucket invalidate path to alloc -* trigger */ #define BTREE_TRIGGER_FLAGS () \ x(norun) \@@ -270,8 +267,7 @@ struct btree_node_iter {x (gc) \x (insert ) \x (overwrite) \ -x (is_root) \ -x (bucket_invalidate) +x (is_root) enum {#define x (n) BTREE_ITER_FLAG_BIT_##n,Signature · 1 line
2.48.1