bcachefs: fix deadlock in journal_entry_open()

Browse source

In the previous commit b3d82c2f27, code was added to prevent journal sequence
overflow. Among them, the code added to journal_entry_open() uses the
bch2_fs_fatal_err_on() function to handle errors.

However, __journal_res_get() , which calls journal_entry_open() , calls
journal_entry_open() while holding journal->lock , but bch2_fs_fatal_err_on()
internally tries to acquire journal->lock , which results in a deadlock.

So we need to add a locked helper to handle fatal errors even when the
journal->lock is held.

Fixes: b3d82c2f27 ("bcachefs: Guard against journal seq overflow")
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

...

This commit is contained in:

Jeongjun Park 2025-02-02 15:13:51 +09:00 • committed by Kent Overstreet

parent 6b37037d6d

commit 2ef995df0c

4 changed files with 28 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

fs/bcachefs/journal.c

View file

1

fs/bcachefs/journal.h

View file

11

fs/bcachefs/super.c

View file

1

fs/bcachefs/super.h

View file