mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 18:13:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: fix bch2_invalidate_one_bucket2() during journal replay

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2019-03-13 16:56:48 -04:00
committed by Kent Overstreet
parent 61f321fc8b
commit 18c9883e1c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/bcachefs/alloc_background.c
View File

@@ -939,7 +939,7 @@ static int bch2_invalidate_one_bucket2(struct bch_fs *c, struct bch_dev *ca,
else
memset(&u, 0, sizeof(u));
invalidating_cached_data = u.cached_sectors != 0;
invalidating_cached_data = m.cached_sectors != 0;
//BUG_ON(u.dirty_sectors);
u.data_type = 0;
@@ -947,7 +947,13 @@ static int bch2_invalidate_one_bucket2(struct bch_fs *c, struct bch_dev *ca,
u.cached_sectors = 0;
u.read_time = c->bucket_clock[READ].hand;
u.write_time = c->bucket_clock[WRITE].hand;
u.gen++;
/*
* The allocator has to start before journal replay is finished - thus,
* we have to trust the in memory bucket @m, not the version in the
* btree:
*/
u.gen = m.gen + 1;
a = bkey_alloc_init(&alloc_key.k);
a->k.p = iter->pos;
@@ -963,6 +969,7 @@ static int bch2_invalidate_one_bucket2(struct bch_fs *c, struct bch_dev *ca,
ret = bch2_btree_insert_at(c, NULL,
invalidating_cached_data ? journal_seq : NULL,
BTREE_INSERT_ATOMIC|
BTREE_INSERT_NOUNLOCK|
BTREE_INSERT_NOCHECK_RW|
BTREE_INSERT_NOFAIL|
BTREE_INSERT_USE_RESERVE|
@@ -982,6 +989,10 @@ static int bch2_invalidate_one_bucket2(struct bch_fs *c, struct bch_dev *ca,
if (!top->nr)
heap_pop(&ca->alloc_heap, e, bucket_alloc_cmp, NULL);
/* with btree still locked: */
if (ca->buckets_written)
set_bit(b, ca->buckets_written);
/*
* Make sure we flush the last journal entry that updated this
* bucket (i.e. deleting the last reference) before writing to