bcachefs: Fix double counting when gc is running

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 6dff960e095da69cd4209ab82ad0d6b2b535fdda..60aa28e3f5f873a6925915cb394e2424a7c45115 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -1088,8 +1088,7 @@ static void bch2_btree_set_root_inmem(struct btree_update *as, struct btree *b)
                bch2_btree_node_free_index(as, NULL,
                                           bkey_i_to_s_c(&old->key),
                                           fs_usage);
-       bch2_fs_usage_apply(c, fs_usage, &as->reserve->disk_res,
-                           gc_pos_btree_root(b->btree_id));
+       bch2_fs_usage_apply(c, fs_usage, &as->reserve->disk_res);
 
        preempt_enable();
        percpu_up_read(&c->mark_lock);
@@ -1192,8 +1191,7 @@ static void bch2_insert_fixup_btree_ptr(struct btree_update *as, struct btree *b
                                           bkey_disassemble(b, k, &tmp),
                                           fs_usage);
 
-       bch2_fs_usage_apply(c, fs_usage, &as->reserve->disk_res,
-                           gc_pos_btree_node(b));
+       bch2_fs_usage_apply(c, fs_usage, &as->reserve->disk_res);
 
        preempt_enable();
        percpu_up_read(&c->mark_lock);
@@ -1993,8 +1991,7 @@ static void __bch2_btree_node_update_key(struct bch_fs *c,
                bch2_btree_node_free_index(as, NULL,
                                           bkey_i_to_s_c(&b->key),
                                           fs_usage);
-               bch2_fs_usage_apply(c, fs_usage, &as->reserve->disk_res,
-                                   gc_pos_btree_root(b->btree_id));
+               bch2_fs_usage_apply(c, fs_usage, &as->reserve->disk_res);
 
                percpu_up_read(&c->mark_lock);
                mutex_unlock(&c->btree_interior_update_lock);

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 9aa369c6f28eae1c69411e5904b2eb30bf5280dd..58074f791c629fb87de942f732f0126cc26ed273 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -255,8 +255,7 @@ static bool bucket_became_unavailable(struct bucket_mark old,
 
 int bch2_fs_usage_apply(struct bch_fs *c,
                        struct bch_fs_usage *fs_usage,
-                       struct disk_reservation *disk_res,
-                       struct gc_pos gc_pos)
+                       struct disk_reservation *disk_res)
 {
        s64 added = fs_usage->s.data + fs_usage->s.reserved;
        s64 should_not_have_added;
@@ -285,13 +284,6 @@ int bch2_fs_usage_apply(struct bch_fs *c,
        acc_u64s((u64 *) this_cpu_ptr(c->usage[0]),
                 (u64 *) fs_usage,
                 sizeof(*fs_usage) / sizeof(u64) + c->replicas.nr);
-
-       if (gc_visited(c, gc_pos)) {
-               BUG_ON(!c->usage[1]);
-               acc_u64s((u64 *) this_cpu_ptr(c->usage[1]),
-                        (u64 *) fs_usage,
-                        sizeof(*fs_usage) / sizeof(u64) + c->replicas.nr);
-       }
        preempt_enable();
 
        return ret;
@@ -1001,7 +993,7 @@ void bch2_mark_update(struct btree_insert *trans,
                bch2_btree_node_iter_advance(&node_iter, b);
        }
 
-       if (bch2_fs_usage_apply(c, fs_usage, trans->disk_res, pos) &&
+       if (bch2_fs_usage_apply(c, fs_usage, trans->disk_res) &&
            !warned_disk_usage &&
            !xchg(&warned_disk_usage, 1)) {
                char buf[200];

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index ecc4ae22f7360408296fbbb873c8e3f9e294206a..4d4a10203e5cfc89e8ce6efea5e321c6577a5eea 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -260,7 +260,7 @@ int bch2_mark_key(struct bch_fs *, struct bkey_s_c,
                  struct bch_fs_usage *, u64, unsigned);
 void bch2_mark_update(struct btree_insert *, struct btree_insert_entry *);
 int bch2_fs_usage_apply(struct bch_fs *, struct bch_fs_usage *,
-                       struct disk_reservation *, struct gc_pos);
+                       struct disk_reservation *);
 
 /* disk reservations: */