diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-27 23:52:41 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-02 00:40:35 -0400 |
| commit | 163f8d00b9a97f249adca2e1e0ecd30f0235f514 (patch) | |
| tree | a893500fcd7d0d0904c5b3a54e8e99152e660a2d | |
| parent | 55bd3589fd29cfff46c5c8a0576b215bc9a78f68 (diff) | |
fixup! bcachefs: Fix locking in __bch2_set_nr_journal_buckets()
| -rw-r--r-- | fs/bcachefs/journal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index af5386d959c8..d714779a28d0 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -807,8 +807,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; } @@ -861,6 +864,8 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr, ca->mi.bucket_size, gc_phase(GC_PHASE_SB), 0); + if (c) + percpu_up_read(&c->mark_lock); } else { ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_NOFAIL, bch2_trans_mark_metadata_bucket(&trans, ca, |