FAILED: patch "[PATCH] xfs: use null daddr for unset first bad log block" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x cc9af5e461ea5f6e37738f3f1e41c45a9b7f45d6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071429-showdown-footpad-d6da@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From cc9af5e461ea5f6e37738f3f1e41c45a9b7f45d6 Mon Sep 17 00:00:00 2001
From: Yousef Alhouseen <[email protected]>
Date: Tue, 30 Jun 2026 12:06:07 +0200
Subject: [PATCH] xfs: use null daddr for unset first bad log block
xlog_do_recovery_pass() may return before setting first_bad. The caller must distinguish that case from an error at a valid log block, including block zero after the log wraps.
Initialize first_bad to XFS_BUF_DADDR_NULL and test it explicitly before treating the error as a torn write.
fs/xfs/xfs_log_recover.c +3 -3
@@ -1028,7 +1028,7 @@ xlog_verify_head( {struct xlog_rec_header *tmp_rhead;char *tmp_buffer; -xfs_daddr_t first_bad; +xfs_daddr_t first_bad =XFS_BUF_DADDR_NULL ;xfs_daddr_t tmp_rhead_blk;int found;int error;
@@ -1057,7 +1057,8 @@ xlog_verify_head(*/ error =xlog_do_recovery_pass (log, *head_blk, tmp_rhead_blk,XLOG_RECOVER_CRCPASS , &first_bad); -if ((error == -EFSBADCRC || error == -EFSCORRUPTED ) && first_bad) { +if ((error == -EFSBADCRC || error == -EFSCORRUPTED ) && + first_bad !=XFS_BUF_DADDR_NULL ) {/* * We've hit a potential torn write. Reset the error and warn * about it.
@@ -3575,4 +3576,3 @@ xlog_recover_cancel(if (xlog_recovery_needed (log))xlog_recover_cancel_intents (log); } -
Sasha Levin
maintainerPATCH 1/3 xfs: Remove redundant assignment of mp
From: Jiapeng Chong <[email protected]>
[ Upstream commit f4901a182d33d05a3b7020e2af97c635f6c47959 ]
mp is being initialized to log->l_mp but this is never read as record is overwritten later on. Remove the redundant assignment.
Cleans up the following clang-analyzer warning:
fs/xfs/xfs_log_recover.c:3543:20: warning: Value stored to 'mp' during its initialization is never read [clang-analyzer-deadcode.DeadStores].
Stable-dep-of: cc9af5e461ea ("xfs: use null daddr for unset first bad log block")
--- fs/xfs/xfs_log_recover.c | 2 -- 1 file changed, 2 deletions(-)
fs/xfs/xfs_log_recover.c +0 -2
@@ -3570,8 +3570,6 @@ xlog_recover_check_summary(uint64_t ifree;int error; - mp = log->l_mp; - freeblks =0LL ; itotal =0LL ; ifree =0LL ;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 xfs: Remove dead code
From: Jiapeng Chong <[email protected]>
[ Upstream commit e62c720817597f259b81f1ff004eb042293bf046 ]
Remove tht entire xlog_recover_check_summary() function, this entire function is dead code and has been for 12 years.
Stable-dep-of: cc9af5e461ea ("xfs: use null daddr for unset first bad log block")
--- fs/xfs/xfs_log_recover.c | 59 ---------------------------------------- 1 file changed, 59 deletions(-)
fs/xfs/xfs_log_recover.c +0 -59
@@ -39,13 +39,6 @@ STATIC intxlog_clear_stale_blocks ( struct xlog *, xfs_lsn_t); -#if defined(DEBUG ) -STATIC void -xlog_recover_check_summary ( -struct xlog *); -#else -#define xlog_recover_check_summary (log) -#endif STATIC intxlog_do_recovery_pass (struct xlog *,xfs_daddr_t ,xfs_daddr_t ,int ,xfs_daddr_t *);
@@ -3373,8 +3366,6 @@ xlog_do_recover( } mp->m_alloc_set_aside =xfs_alloc_set_aside (mp); -xlog_recover_check_summary (log); -/* Normal transactions can now occur */ clear_bit (XLOG_ACTIVE_RECOVERY , &log->l_opstate);return 0 ;
@@ -3517,7 +3508,6 @@ xlog_recover_finish( }xlog_recover_process_iunlinks (log); -xlog_recover_check_summary (log);/* * Recover any CoW staging blocks that are still referenced by the
@@ -3551,52 +3541,3 @@ xlog_recover_cancel(xlog_recover_cancel_intents (log); } -#if defined(DEBUG ) -/* -* Read all of the agf and agi counters and check that they -* are consistent with the superblock counters. -*/ -STATIC void -xlog_recover_check_summary ( -struct xlog *log) -{ -struct xfs_mount *mp = log->l_mp; -struct xfs_perag *pag; -struct xfs_buf *agfbp; -struct xfs_buf *agibp; -xfs_agnumber_t agno; -uint64_t freeblks; -uint64_t itotal; -uint64_t ifree; -int error; - - freeblks =0LL ; - itotal =0LL ; - ifree =0LL ; -for_each_perag (mp, agno, pag) { - error =xfs_read_agf (mp,NULL , pag->pag_agno,0 , &agfbp); -if (error) { -xfs_alert (mp,"%s agf read failed agno %d error %d" , - __func__, pag->pag_agno, error); - }else { -struct xfs_agf *agfp = agfbp->b_addr; - - freeblks +=be32_to_cpu (agfp->agf_freeblks) + -be32_to_cpu (agfp->agf_flcount); -xfs_buf_relse (agfbp); - } - - error =xfs_read_agi (mp,NULL , pag->pag_agno, &agibp); -if (error) { -xfs_alert (mp,"%s agi read failed agno %d error %d" , - __func__, pag->pag_agno, error); - }else { -struct xfs_agi *agi = agibp->b_addr; - - itotal +=be32_to_cpu (agi->agi_count); - ifree +=be32_to_cpu (agi->agi_freecount); -xfs_buf_relse (agibp); - } - } -} -#endif /* DEBUG */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 xfs: use null daddr for unset first bad log block
In reply to Sasha LevinFrom: Yousef Alhouseen <[email protected]>
[ Upstream commit cc9af5e461ea5f6e37738f3f1e41c45a9b7f45d6 ]
xlog_do_recovery_pass() may return before setting first_bad. The caller must distinguish that case from an error at a valid log block, including block zero after the log wraps.
Initialize first_bad to XFS_BUF_DADDR_NULL and test it explicitly before treating the error as a torn write.
--- fs/xfs/xfs_log_recover.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/xfs/xfs_log_recover.c +3 -3
@@ -1028,7 +1028,7 @@ xlog_verify_head( {struct xlog_rec_header *tmp_rhead;char *tmp_buffer; -xfs_daddr_t first_bad; +xfs_daddr_t first_bad =XFS_BUF_DADDR_NULL ;xfs_daddr_t tmp_rhead_blk;int found;int error;
@@ -1057,7 +1057,8 @@ xlog_verify_head(*/ error =xlog_do_recovery_pass (log, *head_blk, tmp_rhead_blk,XLOG_RECOVER_CRCPASS , &first_bad); -if ((error == -EFSBADCRC || error == -EFSCORRUPTED ) && first_bad) { +if ((error == -EFSBADCRC || error == -EFSCORRUPTED ) && + first_bad !=XFS_BUF_DADDR_NULL ) {/* * We've hit a potential torn write. Reset the error and warn * about it.
@@ -3540,4 +3541,3 @@ xlog_recover_cancel(if (xlog_recovery_needed (log))xlog_recover_cancel_intents (log); } -
Signature · 1 line
2.53.0