diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-05-14 14:37:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:22 -0400 |
| commit | 6fb076e60d65e574756cd1a4262c1c05b750ec21 (patch) | |
| tree | a230de20d70f97167f28441d0c8ee87b228a586b | |
| parent | ed8413fdab6567985995051869ad211fb8f15d5f (diff) | |
| download | linux-6fb076e60d65e574756cd1a4262c1c05b750ec21.tar.gz linux-6fb076e60d65e574756cd1a4262c1c05b750ec21.tar.bz2 linux-6fb076e60d65e574756cd1a4262c1c05b750ec21.zip | |
bcachefs: Fix spurious inconsistency in recovery
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 8 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.c | 5 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.h | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index 25c18b8cd3a6..61991d898d99 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -232,7 +232,9 @@ int bch2_alloc_read(struct bch_fs *c, struct journal_keys *journal_keys) bch2_trans_init(&trans, c); for_each_btree_key(&trans, iter, BTREE_ID_ALLOC, POS_MIN, 0, k, ret) - bch2_mark_key(c, k, true, 0, NULL, 0, 0); + bch2_mark_key(c, k, true, 0, NULL, 0, + BCH_BUCKET_MARK_NOATOMIC| + BCH_BUCKET_MARK_ALLOC_READ); ret = bch2_trans_exit(&trans) ?: ret; if (ret) { @@ -243,7 +245,9 @@ int bch2_alloc_read(struct bch_fs *c, struct journal_keys *journal_keys) for_each_journal_key(*journal_keys, j) if (j->btree_id == BTREE_ID_ALLOC) bch2_mark_key(c, bkey_i_to_s_c(j->k), - true, 0, NULL, 0, 0); + true, 0, NULL, 0, + BCH_BUCKET_MARK_NOATOMIC| + BCH_BUCKET_MARK_ALLOC_READ); percpu_down_write(&c->mark_lock); bch2_dev_usage_from_buckets(c); diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index d0a288dddb45..78b4c93a7170 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -657,7 +657,7 @@ static int bch2_mark_alloc(struct bch_fs *c, struct bkey_s_c k, g = __bucket(ca, k.k->p.offset, gc); u = bch2_alloc_unpack(k); - old = bucket_data_cmpxchg(c, ca, fs_usage, g, m, ({ + old = bucket_cmpxchg(g, m, ({ m.gen = u.gen; m.data_type = u.data_type; m.dirty_sectors = u.dirty_sectors; @@ -669,6 +669,9 @@ static int bch2_mark_alloc(struct bch_fs *c, struct bkey_s_c k, } })); + if (!(flags & BCH_BUCKET_MARK_ALLOC_READ)) + bch2_dev_usage_update(c, ca, fs_usage, old, m, gc); + g->io_time[READ] = u.read_time; g->io_time[WRITE] = u.write_time; g->oldest_gen = u.oldest_gen; diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h index 578019089a91..9f53fe6280f3 100644 --- a/fs/bcachefs/buckets.h +++ b/fs/bcachefs/buckets.h @@ -251,6 +251,7 @@ void bch2_mark_metadata_bucket(struct bch_fs *, struct bch_dev *, #define BCH_BUCKET_MARK_GC (1 << 0) #define BCH_BUCKET_MARK_NOATOMIC (1 << 1) +#define BCH_BUCKET_MARK_ALLOC_READ (1 << 2) int bch2_mark_key_locked(struct bch_fs *, struct bkey_s_c, bool, s64, struct bch_fs_usage *, |