From: Kent Overstreet Date: Wed, 23 Feb 2022 15:26:10 +0000 (-0500) Subject: bcachefs: Fix for journal getting stuck X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e201f70b116513cb0d17ba32e1f00c234dee9d7e;p=linux.git bcachefs: Fix for journal getting stuck The journal can get stuck if we need to get a journal reservation for something we have a pre-reservation for, but aren't able to reclaim space, or if the pin fifo is full - it's impractical to resize the pin fifo at runtime. Previously, we reserved 8 entries in the pin fifo for pre-reservations, but that seems small - we're seeing the journal occasionally get stuck. Let's reserve a quarter of it. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index 3c7dce3b31c1b..1f26d351697a8 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -416,7 +416,7 @@ unlock: (flags & JOURNAL_RES_GET_RESERVED)) { char *journal_debug_buf = kmalloc(4096, GFP_ATOMIC); - bch_err(c, "Journal stuck!"); + bch_err(c, "Journal stuck! Hava a pre-reservation but journal full"); if (journal_debug_buf) { bch2_journal_debug_to_text(&_PBUF(journal_debug_buf, 4096), j); bch_err(c, "%s", journal_debug_buf); diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h index 17f9037b404ac..9d4c6d86d5c1f 100644 --- a/fs/bcachefs/journal.h +++ b/fs/bcachefs/journal.h @@ -372,7 +372,7 @@ static inline bool journal_check_may_get_unreserved(struct journal *j) { union journal_preres_state s = READ_ONCE(j->prereserved); bool ret = s.reserved < s.remaining && - fifo_free(&j->pin) > 8; + fifo_free(&j->pin) > j->pin.size / 4; lockdep_assert_held(&j->lock);