FAILED: patch "[PATCH] xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags" failed to apply to 6.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.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-6.15.y
git checkout FETCH_HEAD
git cherry-pick -x d2845519b0723c5d5a0266cbf410495f9b8fd65c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025081857-glitter-hummus-4836@gregkh' --subject-prefix 'PATCH 6.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d2845519b0723c5d5a0266cbf410495f9b8fd65c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Wed, 23 Jul 2025 14:19:44 +0200
Subject: [PATCH] xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags
Fix up xfs_inumbers to now pass in the XFS_IBULK* flags into the flags argument to xfs_inobt_walk, which expects the XFS_IWALK* flags.
Currently passing the wrong flags works for non-debug builds because the only XFS_IWALK* flag has the same encoding as the corresponding XFS_IBULK* flag, but in debug builds it can trigger an assert that no incorrect flag is passed. Instead just extra the relevant flag.
fs/xfs/xfs_itable.c +5 -1
@@ -447,17 +447,21 @@ xfs_inumbers( .breq = breq, };struct xfs_trans *tp; +unsigned int iwalk_flags =0 ;int error =0 ;if (xfs_bulkstat_already_done (breq->mp, breq->startino))return 0 ; +if (breq->flags &XFS_IBULK_SAME_AG ) + iwalk_flags |=XFS_IWALK_SAME_AG ; +/* * Grab an empty transaction so that we can use its recursive buffer * locking abilities to detect cycles in the inobt without deadlocking. */ tp =xfs_trans_alloc_empty (breq->mp); - error =xfs_inobt_walk (breq->mp, tp, breq->startino, breq->flags, + error =xfs_inobt_walk (breq->mp, tp, breq->startino, iwalk_flags, xfs_inumbers_walk, breq->icount, &ic);xfs_trans_cancel (tp);
Sasha Levin
maintainerPATCH 1/5 xfs: decouple xfs_trans_alloc_empty from xfs_trans_alloc
From: Christoph Hellwig <[email protected]>
[ Upstream commit 83a80e95e797a2a6d14bf7983e5e6eecf8f5facb ]
xfs_trans_alloc_empty only shares the very basic transaction structure allocation and initialization with xfs_trans_alloc.
Split out a new __xfs_trans_alloc helper for that and otherwise decouple xfs_trans_alloc_empty from xfs_trans_alloc.
Stable-dep-of: d2845519b072 ("xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags")
--- fs/xfs/xfs_trans.c | 52 +++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 24 deletions(-)
fs/xfs/xfs_trans.c +28 -24
@@ -241,6 +241,28 @@ xfs_trans_reserve(return error; } +static struct xfs_trans * +__xfs_trans_alloc ( +struct xfs_mount *mp, +uint flags) +{ +struct xfs_trans *tp; + +ASSERT (!(flags &XFS_TRANS_RES_FDBLKS ) ||xfs_has_lazysbcount (mp)); + + tp =kmem_cache_zalloc (xfs_trans_cache,GFP_KERNEL | __GFP_NOFAIL); +if (!(flags &XFS_TRANS_NO_WRITECOUNT )) +sb_start_intwrite (mp->m_super); +xfs_trans_set_context (tp); + tp->t_flags = flags; + tp->t_mountp = mp; +INIT_LIST_HEAD (&tp->t_items); +INIT_LIST_HEAD (&tp->t_busy); +INIT_LIST_HEAD (&tp->t_dfops); + tp->t_highest_agno =NULLAGNUMBER ; +return tp; +} + int xfs_trans_alloc( struct xfs_mount *mp,
@@ -254,33 +276,16 @@ xfs_trans_alloc(bool want_retry = true;int error; +ASSERT (resp->tr_logres >0 ); +/* * Allocate the handle before we do our freeze accounting and setting up * GFP_NOFS allocation context so that we avoid lockdep false positives * by doing GFP_KERNEL allocations inside sb_start_intwrite(). */ retry: - tp =kmem_cache_zalloc (xfs_trans_cache,GFP_KERNEL | __GFP_NOFAIL); -if (!(flags &XFS_TRANS_NO_WRITECOUNT )) -sb_start_intwrite (mp->m_super); -xfs_trans_set_context (tp); - -/* -* Zero-reservation ("empty") transactions can't modify anything, so -* they're allowed to run while we're frozen. -*/ -WARN_ON (resp->tr_logres >0 && - mp->m_super->s_writers.frozen ==SB_FREEZE_COMPLETE ); -ASSERT (!(flags &XFS_TRANS_RES_FDBLKS ) || -xfs_has_lazysbcount (mp)); - - tp->t_flags = flags; - tp->t_mountp = mp; -INIT_LIST_HEAD (&tp->t_items); -INIT_LIST_HEAD (&tp->t_busy); -INIT_LIST_HEAD (&tp->t_dfops); - tp->t_highest_agno =NULLAGNUMBER ; - +WARN_ON (mp->m_super->s_writers.frozen ==SB_FREEZE_COMPLETE ); + tp =__xfs_trans_alloc (mp, flags); error =xfs_trans_reserve (tp, resp, blocks, rtextents);if (error == -ENOSPC && want_retry) {xfs_trans_cancel (tp);
@@ -329,9 +334,8 @@ xfs_trans_alloc_empty(struct xfs_mount *mp, struct xfs_trans **tpp) { - struct xfs_trans_res resv = {0}; - -return xfs_trans_alloc (mp, &resv,0 ,0 ,XFS_TRANS_NO_WRITECOUNT , tpp); + *tpp =__xfs_trans_alloc (mp,XFS_TRANS_NO_WRITECOUNT ); +return 0 ; }/*
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 2/5 xfs: return the allocated transaction from xfs_trans_alloc_empty
From: Christoph Hellwig <[email protected]>
[ Upstream commit d8e1ea43e5a314bc01ec059ce93396639dcf9112 ]
xfs_trans_alloc_empty can't return errors, so return the allocated transaction directly instead of an output double pointer argument.
Stable-dep-of: d2845519b072 ("xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags")
--- fs/xfs/libxfs/xfs_refcount.c | 4 +--- fs/xfs/scrub/common.c | 3 ++- fs/xfs/scrub/repair.c | 12 ++---------- fs/xfs/scrub/scrub.c | 5 +---- fs/xfs/xfs_attr_item.c | 5 +---- fs/xfs/xfs_discard.c | 12 +++--------- fs/xfs/xfs_fsmap.c | 4 +--- fs/xfs/xfs_icache.c | 5 +---- fs/xfs/xfs_inode.c | 7 ++----- fs/xfs/xfs_itable.c | 18 +++--------------- fs/xfs/xfs_iwalk.c | 11 +++-------- fs/xfs/xfs_notify_failure.c | 5 +---- fs/xfs/xfs_qm.c | 10 ++-------- fs/xfs/xfs_rtalloc.c | 13 +++---------- fs/xfs/xfs_trans.c | 8 +++----- fs/xfs/xfs_trans.h | 3 +-- fs/xfs/xfs_zone_gc.c | 5 +---- 17 files changed, 31 insertions(+), 99 deletions(-)
fs/xfs/libxfs/xfs_refcount.c +1 -3
@@ -2099,9 +2099,7 @@ xfs_refcount_recover_cow_leftovers(* recording the CoW debris we cancel the (empty) transaction * and everything goes away cleanly. */ - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; + tp =xfs_trans_alloc_empty (mp);if (isrt) {xfs_rtgroup_lock (to_rtg (xg),XFS_RTGLOCK_REFCOUNT );
fs/xfs/scrub/common.c +2 -1
@@ -870,7 +870,8 @@ intxchk_trans_alloc_empty ( struct xfs_scrub *sc) { -return xfs_trans_alloc_empty (sc->mp, &sc->tp); + sc->tp =xfs_trans_alloc_empty (sc->mp); +return 0 ; }/*
fs/xfs/scrub/repair.c +2 -10
@@ -1279,18 +1279,10 @@ xrep_trans_alloc_hook_dummy(void **cookiep, struct xfs_trans **tpp) { - int error; - *cookiep = current->journal_info; current->journal_info =NULL ; - - error =xfs_trans_alloc_empty (mp, tpp); -if (!error) -return 0 ; - - current->journal_info = *cookiep; - *cookiep =NULL ; -return error; + *tpp =xfs_trans_alloc_empty (mp); +return 0 ; }/* Cancel a dummy transaction used by a live update hook function. */
fs/xfs/scrub/scrub.c +1 -4
@@ -878,10 +878,7 @@ xchk_scrubv_open_by_handle(struct xfs_inode *ip;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return NULL ; - + tp =xfs_trans_alloc_empty (mp); error =xfs_iget (mp, tp, head->svh_ino,XCHK_IGET_FLAGS ,0 , &ip);xfs_trans_cancel (tp);if (error)
fs/xfs/xfs_attr_item.c +1 -4
@@ -616,10 +616,7 @@ xfs_attri_iread_extents(struct xfs_trans *tp;int error; - error =xfs_trans_alloc_empty (ip->i_mount, &tp); -if (error) -return error; - + tp =xfs_trans_alloc_empty (ip->i_mount);xfs_ilock (ip,XFS_ILOCK_EXCL ); error =xfs_iread_extents (tp, ip,XFS_ATTR_FORK );xfs_iunlock (ip,XFS_ILOCK_EXCL );
fs/xfs/xfs_discard.c +3 -9
@@ -204,9 +204,7 @@ xfs_trim_gather_extents(*/ xfs_log_force (mp,XFS_LOG_SYNC ); - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; + tp =xfs_trans_alloc_empty (mp); error =xfs_alloc_read_agf (pag, tp,0 , &agbp);if (error)
@@ -598,9 +596,7 @@ xfs_trim_rtextents(struct xfs_trans *tp;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; + tp =xfs_trans_alloc_empty (mp);/* * Walk the free ranges between low and high. The query_range function
@@ -716,9 +712,7 @@ xfs_trim_rtgroup_extents(struct xfs_trans *tp;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; + tp =xfs_trans_alloc_empty (mp);/* * Walk the free ranges between low and high. The query_range function
fs/xfs/xfs_fsmap.c +1 -3
@@ -1270,9 +1270,7 @@ xfs_getfsmap(* buffer locking abilities to detect cycles in the rmapbt * without deadlocking. */ - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -break ; + tp =xfs_trans_alloc_empty (mp); info.dev = handlers[i].dev; info.last = false;
fs/xfs/xfs_icache.c +1 -4
@@ -893,10 +893,7 @@ xfs_metafile_iget(struct xfs_trans *tp;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; - + tp =xfs_trans_alloc_empty (mp); error =xfs_trans_metafile_iget (tp, ino, metafile_type, ipp);xfs_trans_cancel (tp);return error;
fs/xfs/xfs_inode.c +2 -5
@@ -2932,12 +2932,9 @@ xfs_inode_reload_unlinked( struct xfs_inode *ip) {struct xfs_trans *tp; -int error; - - error =xfs_trans_alloc_empty (ip->i_mount, &tp); -if (error) -return error; +int error =0 ; + tp =xfs_trans_alloc_empty (ip->i_mount);xfs_ilock (ip,XFS_ILOCK_SHARED );if (xfs_inode_unlinked_incomplete (ip)) error =xfs_inode_reload_unlinked_bucket (tp, ip);
fs/xfs/xfs_itable.c +3 -15
@@ -239,14 +239,10 @@ xfs_bulkstat_one(* Grab an empty transaction so that we can use its recursive buffer * locking abilities to detect cycles in the inobt without deadlocking. */ - error =xfs_trans_alloc_empty (breq->mp, &tp); -if (error) - goto out; - + tp =xfs_trans_alloc_empty (breq->mp); error =xfs_bulkstat_one_int (breq->mp, breq->idmap, tp, breq->startino, &bc);xfs_trans_cancel (tp); -out:kfree (bc.buf);/*
@@ -331,17 +327,13 @@ xfs_bulkstat(* Grab an empty transaction so that we can use its recursive buffer * locking abilities to detect cycles in the inobt without deadlocking. */ - error =xfs_trans_alloc_empty (breq->mp, &tp); -if (error) - goto out; - + tp =xfs_trans_alloc_empty (breq->mp);if (breq->flags &XFS_IBULK_SAME_AG ) iwalk_flags |=XFS_IWALK_SAME_AG ; error =xfs_iwalk (breq->mp, tp, breq->startino, iwalk_flags, xfs_bulkstat_iwalk, breq->icount, &bc);xfs_trans_cancel (tp); -out:kfree (bc.buf);/*
@@ -464,14 +456,10 @@ xfs_inumbers(* Grab an empty transaction so that we can use its recursive buffer * locking abilities to detect cycles in the inobt without deadlocking. */ - error =xfs_trans_alloc_empty (breq->mp, &tp); -if (error) - goto out; - + tp =xfs_trans_alloc_empty (breq->mp); error =xfs_inobt_walk (breq->mp, tp, breq->startino, breq->flags, xfs_inumbers_walk, breq->icount, &ic);xfs_trans_cancel (tp); -out:/* * We found some inode groups, so clear the error status and return
fs/xfs/xfs_iwalk.c +3 -8
@@ -377,11 +377,8 @@ xfs_iwalk_run_callbacks(if (!has_more)return 0 ; -if (iwag->drop_trans) { - error =xfs_trans_alloc_empty (mp, &iwag->tp); -if (error) -return error; - } +if (iwag->drop_trans) + iwag->tp =xfs_trans_alloc_empty (mp);/* ...and recreate the cursor just past where we left off. */ error =xfs_ialloc_read_agi (iwag->pag, iwag->tp,0 , agi_bpp);
@@ -617,9 +614,7 @@ xfs_iwalk_ag_work(* Grab an empty transaction so that we can use its recursive buffer * locking abilities to detect cycles in the inobt without deadlocking. */ - error =xfs_trans_alloc_empty (mp, &iwag->tp); -if (error) - goto out; + iwag->tp =xfs_trans_alloc_empty (mp); iwag->drop_trans =1 ; error =xfs_iwalk_ag (iwag);
fs/xfs/xfs_notify_failure.c +1 -4
@@ -280,10 +280,7 @@ xfs_dax_notify_dev_failure( kernel_frozen =xfs_dax_notify_failure_freeze (mp) ==0 ; } - error =xfs_trans_alloc_empty (mp, &tp); -if (error) - goto out; - + tp =xfs_trans_alloc_empty (mp); start_gno =xfs_fsb_to_gno (mp, start_bno, type); end_gno =xfs_fsb_to_gno (mp, end_bno, type);while ((xg =xfs_group_next_range (mp, xg, start_gno, end_gno, type))) {
fs/xfs/xfs_qm.c +2 -8
@@ -681,10 +681,7 @@ xfs_qm_load_metadir_qinos(struct xfs_trans *tp;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; - + tp =xfs_trans_alloc_empty (mp); error =xfs_dqinode_load_parent (tp, &qi->qi_dirip);if (error == -ENOENT ) {/* no quota dir directory, but we'll create one later */
@@ -1803,10 +1800,7 @@ xfs_qm_qino_load(struct xfs_inode *dp =NULL ;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; - + tp =xfs_trans_alloc_empty (mp);if (xfs_has_metadir (mp)) { error =xfs_dqinode_load_parent (tp, &dp);if (error)
fs/xfs/xfs_rtalloc.c +3 -10
@@ -729,9 +729,7 @@ xfs_rtginode_ensure(if (rtg->rtg_inodes[type])return 0 ; - error =xfs_trans_alloc_empty (rtg_mount (rtg), &tp); -if (error) -return error; + tp =xfs_trans_alloc_empty (rtg_mount (rtg)); error =xfs_rtginode_load (rtg, type, tp);xfs_trans_cancel (tp);
@@ -1305,9 +1303,7 @@ xfs_growfs_rt_prep_groups(if (!mp->m_rtdirip) {struct xfs_trans *tp; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; + tp =xfs_trans_alloc_empty (mp); error =xfs_rtginode_load_parent (tp);xfs_trans_cancel (tp);
@@ -1674,10 +1670,7 @@ xfs_rtmount_inodes(struct xfs_rtgroup *rtg =NULL ;int error; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; - + tp =xfs_trans_alloc_empty (mp);if (xfs_has_rtgroups (mp) && mp->m_sb.sb_rgcount >0 ) { error =xfs_rtginode_load_parent (tp);if (error)
fs/xfs/xfs_trans.c +3 -5
@@ -329,13 +329,11 @@ xfs_trans_alloc(* where we can be grabbing buffers at the same time that freeze is trying to * drain the buffer LRU list. */ -int +struct xfs_trans *xfs_trans_alloc_empty ( -struct xfs_mount *mp, -struct xfs_trans **tpp) +struct xfs_mount *mp) { - *tpp =__xfs_trans_alloc (mp,XFS_TRANS_NO_WRITECOUNT ); -return 0 ; +return __xfs_trans_alloc (mp,XFS_TRANS_NO_WRITECOUNT ); }/*
fs/xfs/xfs_trans.h +1 -2
@@ -168,8 +168,7 @@ int xfs_trans_alloc(struct xfs_mount *mp, struct xfs_trans_res *resp, struct xfs_trans **tpp);int xfs_trans_reserve_more (struct xfs_trans *tp,unsigned int blocks,unsigned int rtextents); -int xfs_trans_alloc_empty (struct xfs_mount *mp, -struct xfs_trans **tpp); +struct xfs_trans *xfs_trans_alloc_empty (struct xfs_mount *mp);void xfs_trans_mod_sb (xfs_trans_t *,uint ,int64_t ); int xfs_trans_get_buf_map(struct xfs_trans *tp, struct xfs_buftarg *target,
fs/xfs/xfs_zone_gc.c +1 -4
@@ -330,10 +330,7 @@ xfs_zone_gc_query( iter->rec_idx =0 ; iter->rec_count =0 ; - error =xfs_trans_alloc_empty (mp, &tp); -if (error) -return error; - + tp =xfs_trans_alloc_empty (mp);xfs_rtgroup_lock (rtg,XFS_RTGLOCK_RMAP ); cur =xfs_rtrmapbt_init_cursor (tp, rtg); error = xfs_rmap_query_range(cur, &ri_low, &ri_high,
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 3/5 xfs: improve the comments in xfs_select_zone_nowait
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 60e02f956d77af31b85ed4e73abf85d5f12d0a98 ]
The top of the function comment is outdated, and the parts still correct duplicate information in comment inside the function. Remove the top of the function comment and instead improve a comment inside the function.
Stable-dep-of: d2845519b072 ("xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags")
--- fs/xfs/xfs_zone_alloc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
fs/xfs/xfs_zone_alloc.c +2 -8
@@ -653,13 +653,6 @@ static inline bool xfs_zoned_pack_tight(struct xfs_inode *ip) !(ip->i_diflags &XFS_DIFLAG_APPEND ); } -/* -* Pick a new zone for writes. -* -* If we aren't using up our budget of open zones just open a new one from the -* freelist. Else try to find one that matches the expected data lifetime. If -* we don't find one that is good pick any zone that is available. -*/ static struct xfs_open_zone * xfs_select_zone_nowait( struct xfs_mount *mp,
@@ -687,7 +680,8 @@ xfs_select_zone_nowait( goto out_unlock;/* -* See if we can open a new zone and use that. +* See if we can open a new zone and use that so that data for different +* files is mixed as little as possible. */ oz =xfs_try_open_zone (mp, write_hint);if (oz)
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 4/5 xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit d2845519b0723c5d5a0266cbf410495f9b8fd65c ]
Fix up xfs_inumbers to now pass in the XFS_IBULK* flags into the flags argument to xfs_inobt_walk, which expects the XFS_IWALK* flags.
Currently passing the wrong flags works for non-debug builds because the only XFS_IWALK* flag has the same encoding as the corresponding XFS_IBULK* flag, but in debug builds it can trigger an assert that no incorrect flag is passed. Instead just extra the relevant flag.
--- fs/xfs/xfs_itable.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/xfs/xfs_itable.c +5 -1
@@ -447,17 +447,21 @@ xfs_inumbers( .breq = breq, };struct xfs_trans *tp; +unsigned int iwalk_flags =0 ;int error =0 ;if (xfs_bulkstat_already_done (breq->mp, breq->startino))return 0 ; +if (breq->flags &XFS_IBULK_SAME_AG ) + iwalk_flags |=XFS_IWALK_SAME_AG ; +/* * Grab an empty transaction so that we can use its recursive buffer * locking abilities to detect cycles in the inobt without deadlocking. */ tp =xfs_trans_alloc_empty (breq->mp); - error =xfs_inobt_walk (breq->mp, tp, breq->startino, breq->flags, + error =xfs_inobt_walk (breq->mp, tp, breq->startino, iwalk_flags, xfs_inumbers_walk, breq->icount, &ic);xfs_trans_cancel (tp);
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 5/5 xfs: Remove unused label in xfs_dax_notify_dev_failure
In reply to Sasha LevinFrom: Alan Huang <[email protected]>
[ Upstream commit 8c10b04f9fc1760cb79068073686d8866e59d40f ]
--- fs/xfs/xfs_notify_failure.c | 1 - 1 file changed, 1 deletion(-)
fs/xfs/xfs_notify_failure.c +0 -1
@@ -351,7 +351,6 @@ xfs_dax_notify_dev_failure( error = -EFSCORRUPTED ; } -out:/* Thaw the fs if it has been frozen before. */ if (mf_flags &MF_MEM_PRE_REMOVE )xfs_dax_notify_failure_thaw (mp, kernel_frozen);
Signature · 1 line
2.50.1