iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix locking in __bch2_set_nr_journal_buckets()

Browse Source 
We weren't holding mark_lock correctly - it's needed for the new_fs
path.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2021-05-16 23:46:08 -04:00 committed by Kent Overstreet
parent d125615a4e
commit 6ebe32b94c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/bcachefs/journal.c
View File

@ -804,8 +804,11 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr,
long b;
if (new_fs) {
if (c)
percpu_down_read(&c->mark_lock);
b = bch2_bucket_alloc_new_fs(ca);
if (b < 0) {
percpu_up_read(&c->mark_lock);
ret = -ENOSPC;
goto err;
}
@ -820,11 +823,11 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr,
}
b = sector_to_bucket(ca, ob->ptr.offset);
percpu_down_read(&c->mark_lock);
spin_lock(&c->journal.lock);
}
if (c)
spin_lock(&c->journal.lock);
/*
* XXX
* For resize at runtime, we should be writing the new
@ -850,15 +853,17 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr,
if (pos <= ja->cur_idx)
ja->cur_idx = (ja->cur_idx + 1) % ja->nr;
if (c)
spin_unlock(&c->journal.lock);
if (new_fs) {
bch2_mark_metadata_bucket(c, ca, b, BCH_DATA_journal,
ca->mi.bucket_size,
gc_phase(GC_PHASE_SB),
0);
if (c)
percpu_up_read(&c->mark_lock);
} else {
spin_unlock(&c->journal.lock);
percpu_up_read(&c->mark_lock);
ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_NOFAIL,
bch2_trans_mark_metadata_bucket(&trans, ca,
b, BCH_DATA_journal,