diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-02-12 14:58:55 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-03 12:44:07 -0400 |
| commit | ae2082a190e202b95834938e8171a7c98c110da4 (patch) | |
| tree | 8391b2216a1f7450c1808e176a32927a3f7f4916 | |
| parent | 773203049a30fa37c989203592215c42d2d4f875 (diff) | |
bcachefs: Fix double counting when gc is running
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 9 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.c | 10 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.h | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 43eeca4c316e..6504401e01f4 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1086,8 +1086,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); percpu_up_read_preempt_enable(&c->mark_lock); mutex_unlock(&c->btree_interior_update_lock); @@ -1188,8 +1187,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); percpu_up_read_preempt_enable(&c->mark_lock); mutex_unlock(&c->btree_interior_update_lock); @@ -1988,8 +1986,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_preempt_enable(&c->mark_lock); mutex_unlock(&c->btree_interior_update_lock); diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 5a9944521d79..cc0998546864 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -254,8 +254,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; @@ -284,13 +283,6 @@ int bch2_fs_usage_apply(struct bch_fs *c, (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); - } - return ret; } diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h index 99430f1355e4..a362bec97d84 100644 --- a/fs/bcachefs/buckets.h +++ b/fs/bcachefs/buckets.h @@ -259,7 +259,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: */ |