diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-07 13:30:40 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-08 22:55:14 -0400 |
| commit | 58ae103b0a2b5d881d6e8ff68fe17bb822148ce7 (patch) | |
| tree | 4c794fc614fdf2d5e2521d335ef721b4c17f1d1e /libbcachefs/journal.c | |
| parent | f6d87e9a87859dbf9b15269d4de165cf3aadf661 (diff) | |
Update bcachefs sources to e3a7cee503 bcachefs: Don't mark superblocks past end of usable space
Diffstat (limited to 'libbcachefs/journal.c')
| -rw-r--r-- | libbcachefs/journal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c index af5386d9..d714779a 100644 --- a/libbcachefs/journal.c +++ b/libbcachefs/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, |