bcachefs: Kill BTREE_TRIGGER_bucket_invalidate

Signed-off-by: Alan Huang <mmpgouride@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index 81e2ae4bb400bbd240ea267da36b44fe6335f478..51dfd2f24c209713a5a5183a7d0649023b97fed8 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -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;

diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h
index 3acccca3b3a334eec09e6a97768613c95a7e3fc8..e5a965db68b47739acc631c3dbcf6899c0b3eb58 100644 (file)
--- a/fs/bcachefs/btree_types.h
+++ b/fs/bcachefs/btree_types.h
@@ -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,