From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, kent.overstreet@linux.dev
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH] bcachefs: Change btree_insert_node() assertion to error
Date: Thu, 8 May 2025 21:52:34 -0400 [thread overview]
Message-ID: <20250508135854-9bc02251c704108b@stable.kernel.org> (raw)
In-Reply-To: <20250507183051.3235368-1-kent.overstreet@linux.dev>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 63c3b8f616cc95bb1fcc6101c92485d41c535d7c
Note: The patch differs from the upstream commit:
---
1: 63c3b8f616cc9 ! 1: fa08530b7ad9e bcachefs: Change btree_insert_node() assertion to error
@@ Commit message
Print useful debug info and go emergency read-only.
+ (cherry picked from commit 63c3b8f616cc95bb1fcc6101c92485d41c535d7c)
+
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
## fs/bcachefs/btree_update_interior.c ##
@@ fs/bcachefs/btree_update_interior.c: static int bch2_btree_insert_node(struct bt
ret = bch2_btree_node_lock_write(trans, path, &b->c);
if (ret)
return ret;
+
+ ## fs/bcachefs/error.c ##
+@@
+
+ #define FSCK_ERR_RATELIMIT_NR 10
+
++void bch2_log_msg_start(struct bch_fs *c, struct printbuf *out)
++{
++#ifdef BCACHEFS_LOG_PREFIX
++ prt_printf(out, bch2_log_msg(c, ""));
++#endif
++ printbuf_indent_add(out, 2);
++}
++
+ bool bch2_inconsistent_error(struct bch_fs *c)
+ {
+ set_bit(BCH_FS_error, &c->flags);
+
+ ## fs/bcachefs/error.h ##
+@@ fs/bcachefs/error.h: struct work_struct;
+
+ /* Error messages: */
+
++void bch2_log_msg_start(struct bch_fs *, struct printbuf *);
++
+ /*
+ * Inconsistency errors: The on disk data is inconsistent. If these occur during
+ * initial recovery, they don't indicate a bug in the running code - we walk all
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.14.y | Success | Success |
| stable/linux-6.12.y | Success | Success |
| stable/linux-6.6.y | Success | Success |
| stable/linux-6.1.y | Success | Success |
| stable/linux-5.15.y | Success | Success |
| stable/linux-5.10.y | Success | Success |
| stable/linux-5.4.y | Success | Success |
prev parent reply other threads:[~2025-05-09 1:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-07 18:30 [PATCH] bcachefs: Change btree_insert_node() assertion to error Kent Overstreet
2025-05-09 1:52 ` Sasha Levin [this message]
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=20250508135854-9bc02251c704108b@stable.kernel.org \
--to=sashal@kernel.org \
--cc=kent.overstreet@linux.dev \
--cc=stable@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox