From: Milos Nikic <nikic.milos@gmail.com>
To: jack@suse.cz
Cc: tytso@mit.edu, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org, Milos Nikic <nikic.milos@gmail.com>
Subject: [PATCH v5 0/2] jbd2: audit and convert legacy J_ASSERT usage
Date: Wed, 4 Mar 2026 09:20:14 -0800 [thread overview]
Message-ID: <20260304172016.23525-1-nikic.milos@gmail.com> (raw)
Hello Jan and the ext4 team,
This patch series follows up on the previous discussion regarding
converting hard J_ASSERT panics into graceful journal aborts.
In v1, we addressed a specific panic on unlock. Per Jan's suggestion,
I have audited fs/jbd2/transaction.c for other low-hanging fruit
where state machine invariants are enforced by J_ASSERT inside
functions that natively support error returns.
Changes in v5:
Patch 2: Folded a redundant if check into the WARN_ON_ONCE block in
jbd2_journal_dirty_metadata per Andreas's suggestion.
Carried over Reviewed-by tags from Jan, Andreas and Zhang.
Changes in v4:
Patch 2: Fixed a build test WARNING by initializing a variable
`journal` earlier in jbd2_journal_dirty_metadata().
Changes in v3:
Patch 2: Added pr_err() statements inside the ambiguous WARN_ON_ONCE()
blocks (where multiple conditions are checked via logical OR/AND) to
explicitly dump the b_transaction, b_next_transaction, and
j_committing_transaction pointers. This provides necessary context for
debugging state machine corruptions from the dmesg stack trace.
Changes in v2:
Patch 1: Unmodified from v1. Collected Reviewed-by tags.
Patch 2: New patch resulting from the broader audit. Systematically
replaces J_ASSERTs with WARN_ON_ONCE and graceful -EINVAL returns
across 6 core transaction lifecycle functions. Careful attention was
paid to ensuring spinlocks are safely dropped before triggering
jbd2_journal_abort(), and no memory is leaked on the error paths.
Milos Nikic (2):
jbd2: gracefully abort instead of panicking on unlocked buffer
jbd2: gracefully abort on transaction state corruptions
fs/jbd2/transaction.c | 121 ++++++++++++++++++++++++++++++++----------
1 file changed, 92 insertions(+), 29 deletions(-)
--
2.53.0
next reply other threads:[~2026-03-04 17:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 17:20 Milos Nikic [this message]
2026-03-04 17:20 ` [PATCH v5 1/2] jbd2: gracefully abort instead of panicking on unlocked buffer Milos Nikic
2026-03-23 21:50 ` Milos Nikic
2026-03-24 13:52 ` Jan Kara
2026-03-04 17:20 ` [PATCH v5 2/2] jbd2: gracefully abort on transaction state corruptions Milos Nikic
2026-04-10 15:18 ` [PATCH v5 0/2] jbd2: audit and convert legacy J_ASSERT usage Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260304172016.23525-1-nikic.milos@gmail.com \
--to=nikic.milos@gmail.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.