diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-09-19 22:36:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:14 -0400 |
| commit | cfda31c03315ac8cf2a57142f5a6c7510b3f3706 (patch) | |
| tree | 27b363ffd4a414e9f3209a9ff71522f0a08fca67 | |
| parent | 4b33a1916a351ba3bf5af42fb38a988a5dce11bf (diff) | |
| download | lwn-cfda31c03315ac8cf2a57142f5a6c7510b3f3706.tar.gz lwn-cfda31c03315ac8cf2a57142f5a6c7510b3f3706.zip | |
bcachefs: drop journal lock before calling journal_write
bch2_journal_write() expects process context, it takes journal_lock as
needed.
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/journal_io.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index 269c8e8a1d95..6a3d6a374e9c 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -1554,6 +1554,7 @@ static void journal_write_done(struct closure *cl) if (!journal_state_count(new, new.unwritten_idx) && journal_last_unwritten_seq(j) <= journal_cur_seq(j)) { + spin_unlock(&j->lock); closure_call(&j->io, bch2_journal_write, c->io_complete_wq, NULL); } else if (journal_last_unwritten_seq(j) == journal_cur_seq(j) && new.cur_entry_offset < JOURNAL_ENTRY_CLOSED_VAL) { @@ -1566,10 +1567,11 @@ static void journal_write_done(struct closure *cl) * might want to be written now: */ + spin_unlock(&j->lock); mod_delayed_work(c->io_complete_wq, &j->write_work, max(0L, delta)); + } else { + spin_unlock(&j->lock); } - - spin_unlock(&j->lock); } static void journal_write_endio(struct bio *bio) |