iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Work around a journal self-deadlock

Browse Source 
bch2_journal_space_available -> bch2_journal_halt() self deadlocks on
journal lock; work around this by dropping/retaking journal lock before
we call bch2_fatal_error().

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-03-28 16:21:26 -04:00 committed by Kent Overstreet
parent 30690c441a
commit 7fda0f08fa
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/bcachefs/journal_reclaim.c
View File

@ -216,7 +216,14 @@ void bch2_journal_space_available(struct journal *j)
bch_err(c, "journal stuck\n%s", buf.buf); bch_err(c, "journal stuck\n%s", buf.buf);
printbuf_exit(&buf); printbuf_exit(&buf);
/*
* Hack: bch2_fatal_error() calls bch2_journal_halt() which
* takes journal lock:
*/
spin_unlock(&j->lock);
bch2_fatal_error(c); bch2_fatal_error(c);
spin_lock(&j->lock);
ret = cur_entry_journal_stuck; ret = cur_entry_journal_stuck;
} else if (!j->space[journal_space_discarded].next_entry) } else if (!j->space[journal_space_discarded].next_entry)
ret = cur_entry_journal_full; ret = cur_entry_journal_full;