[ 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 |