diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-07-23 22:55:48 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-07-23 22:55:48 -0400 |
| commit | fa7be73f307a24ebf3a958ba389d33f43321293f (patch) | |
| tree | 3493ddfb9a859d159e8641f32bd35055a55aeb23 /libbcachefs/journal.c | |
| parent | 5023292623e8f1dedc138a20daabbcc4772a0d86 (diff) | |
Update bcachefs sources to d90e3ac64900 bcachefs: live_child() no longer uses recursiondebug
Diffstat (limited to 'libbcachefs/journal.c')
| -rw-r--r-- | libbcachefs/journal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c index f9e2e1a4..07869436 100644 --- a/libbcachefs/journal.c +++ b/libbcachefs/journal.c @@ -1060,14 +1060,13 @@ static struct journal_buf *__bch2_next_write_buffer_flush_journal_buf(struct jou if (open && !*blocked) { __bch2_journal_block(j); + s.v = atomic64_read_acquire(&j->reservations.counter); *blocked = true; } ret = journal_state_count(s, idx & JOURNAL_STATE_BUF_MASK) > open ? ERR_PTR(-EAGAIN) : buf; - if (!IS_ERR(ret)) - smp_mb(); break; } } @@ -1297,7 +1296,7 @@ int bch2_dev_journal_bucket_delete(struct bch_dev *ca, u64 b) return -EINVAL; } - u64 *new_buckets = kcalloc(ja->nr, sizeof(u64), GFP_KERNEL);; + u64 *new_buckets = kcalloc(ja->nr, sizeof(u64), GFP_KERNEL); if (!new_buckets) return bch_err_throw(c, ENOMEM_set_nr_journal_buckets); |