FAILED: patch "[PATCH] xfs: don't replace the wrong part of the cow fork" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-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.12.y
git checkout FETCH_HEAD
git cherry-pick -x a1caeeadbf57ff86dfc3454398c46de86056a74e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071711-ion-surgery-b10c@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a1caeeadbf57ff86dfc3454398c46de86056a74e Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <[email protected]>
Date: Mon, 13 Jul 2026 23:04:08 -0700
Subject: [PATCH] xfs: don't replace the wrong part of the cow fork
LOLLM points out that xfs_iext_lookup_extent can return a @got where got->br_startoff < startoff. In this case, xrep_cow_replace_range replaces the entire mapping instead of just the part that had been marked bad in the bitmap, but advances the bitmap cursor in xrep_cow_replace by the amount replaced. As a result, we fail to replace the end of the bad range, and replace part of the good range.
Fix this by rewriting the replace method to handle replacing the middle of a cow fork mapping. This we do by returning both the current mapping as @got, and the subset of the mapping that we want to replace as @rep, using @rep to store the results of the new allocation, and comparing @rep to @got to figure out the exact transformations needed.
fs/xfs/scrub/cow_repair.c +131 -72
@@ -80,12 +80,6 @@ struct xrep_cow {unsigned int next_bno; }; -/* CoW staging extent. */ -struct xrep_cow_extent { -xfs_fsblock_t fsbno; -xfs_extlen_t len; -}; -/* * Mark the part of the file range that corresponds to the given physical * space. Caller must ensure that the physical range is within xc->irec.
@@ -401,22 +395,21 @@ out_rtg: STATIC intxrep_cow_alloc (struct xfs_scrub *sc, -xfs_extlen_t maxlen, -struct xrep_cow_extent *repl) +struct xfs_bmbt_irec *del) {struct xfs_alloc_arg args = { .tp = sc->tp, .mp = sc->mp, .oinfo =XFS_RMAP_OINFO_SKIP_UPDATE , .minlen =1 , - .maxlen = maxlen, + .maxlen = del->br_blockcount, .prod =1 , .resv =XFS_AG_RESV_NONE , .datatype =XFS_ALLOC_USERDATA , };int error; - error =xfs_trans_reserve_more (sc->tp, maxlen,0 ); + error =xfs_trans_reserve_more (sc->tp, del->br_blockcount,0 );if (error)return error;
@@ -428,8 +421,8 @@ xrep_cow_alloc(xfs_refcount_alloc_cow_extent (sc->tp, false, args.fsbno, args.len); - repl->fsbno = args.fsbno; - repl->len = args.len; + del->br_startblock = args.fsbno; + del->br_blockcount = args.len;return 0 ; }
@@ -440,10 +433,12 @@ xrep_cow_alloc( STATIC intxrep_cow_alloc_rt (struct xfs_scrub *sc, -xfs_extlen_t maxlen, -struct xrep_cow_extent *repl) +struct xfs_bmbt_irec *del) { -xfs_rtxlen_t maxrtx =xfs_rtb_to_rtx (sc->mp, maxlen); +xfs_fsblock_t fsbno; +xfs_rtxlen_t maxrtx = +min (U32_MAX ,xfs_blen_to_rtbxlen (sc->mp, del->br_blockcount)); +xfs_extlen_t len;int error; error =xfs_trans_reserve_more (sc->tp,0 , maxrtx);
@@ -451,11 +446,14 @@ xrep_cow_alloc_rt(return error; error =xfs_rtallocate_rtgs (sc->tp,NULLRTBLOCK ,1 , maxrtx,1 , false, - false, &repl->fsbno, &repl->len); + false, &fsbno, &len);if (error)return error; -xfs_refcount_alloc_cow_extent (sc->tp, true, repl->fsbno, repl->len); +xfs_refcount_alloc_cow_extent (sc->tp, true, fsbno, len); + + del->br_startblock = fsbno; + del->br_blockcount = len;return 0 ; }
@@ -469,19 +467,19 @@ static inline intxrep_cow_find_mapping ( struct xrep_cow *xc, struct xfs_iext_cursor *icur, - xfs_fileoff_t startoff, - struct xfs_bmbt_irec *got) + xfs_fileoff_t badoff, + xfs_extlen_t badlen, + struct xfs_bmbt_irec *got, + struct xfs_bmbt_irec *rep) { struct xfs_inode *ip = xc->sc->ip;struct xfs_ifork *ifp =xfs_ifork_ptr (ip,XFS_COW_FORK ); -if (!xfs_iext_lookup_extent (ip, ifp, startoff, icur, got)) +if (!xfs_iext_lookup_extent (ip, ifp, badoff, icur, got)) goto bad; +memcpy (rep, got,sizeof (*rep)); -if (got->br_startoff > startoff) - goto bad; - -if (got->br_blockcount ==0 ) +if (got->br_startoff > badoff) goto bad;if (isnullstartblock (got->br_startblock))
@@ -490,6 +488,24 @@ xrep_cow_find_mapping(if (xfs_bmap_is_written_extent (got)) goto bad; +if (got->br_startoff < badoff) { +const int64_t delta = badoff - got->br_startoff; + + rep->br_blockcount -= delta; + rep->br_startoff += delta; + rep->br_startblock += delta; + } + +if (got->br_startoff + got->br_blockcount > badoff + badlen) { +const int64_t delta = (got->br_startoff + got->br_blockcount) - + (badoff + badlen); + + rep->br_blockcount -= delta; + } + +if (got->br_blockcount ==0 ) + goto bad; +return 0 ; bad:ASSERT (0 );
@@ -500,46 +516,92 @@ bad:#define REPLACE_RIGHT_SIDE (1U << 1)/* -* Given a CoW fork mapping @got and a replacement mapping @repl, remap the -* beginning of @got with the space described by @rep. +* Given a CoW fork mapping @got and a replacement mapping @rep, map the space +* described by @rep into the cow fork, pushing aside @got as necessary. @icur +* must point to iext tree leaf containing @got. */ static inline void xrep_cow_replace_mapping ( -struct xfs_inode *ip, -struct xfs_iext_cursor *icur, -const struct xfs_bmbt_irec *got, -const struct xrep_cow_extent *repl) +struct xfs_inode *ip, +struct xfs_iext_cursor *icur, +struct xfs_bmbt_irec *got, +struct xfs_bmbt_irec *rep) { -struct xfs_bmbt_irec new = *got;/* struct copy */ +struct xfs_ifork *ifp =xfs_ifork_ptr (ip,XFS_COW_FORK ); +xfs_fileoff_t rep_endoff = + rep->br_startoff + rep->br_blockcount; +xfs_fileoff_t got_endoff = + got->br_startoff + got->br_blockcount; +uint32_t state =BMAP_COWFORK ; -ASSERT (repl->len >0 ); +ASSERT (rep->br_blockcount >0 );ASSERT (!isnullstartblock (got->br_startblock)); +ASSERT (got->br_startoff <= rep->br_startoff); +ASSERT (got_endoff >= rep_endoff); -trace_xrep_cow_replace_mapping (ip, got, repl->fsbno, repl->len); +trace_xrep_cow_replace_mapping (ip, got, rep); -if (got->br_blockcount == repl->len) { +if (got->br_startoff == rep->br_startoff) + state |=BMAP_LEFT_FILLING ; +if (got_endoff == rep_endoff) + state |=BMAP_RIGHT_FILLING ; + +switch (state & (BMAP_LEFT_FILLING |BMAP_RIGHT_FILLING )) { +case BMAP_LEFT_FILLING |BMAP_RIGHT_FILLING :/* -* The new extent is a complete replacement for the existing -* extent. Update the COW fork record. +* Replacement matches the whole mapping, update the record. */ - new.br_startblock = repl->fsbno; -xfs_iext_update_extent (ip,BMAP_COWFORK , icur, &new); -return ; +xfs_iext_update_extent (ip, state, icur, rep); +break ; +case BMAP_LEFT_FILLING : +/* +* Replace the first part of the mapping: Update the cursor +* position with the new mapping, then add a record with the +* tail of the old mapping. +*/ + got->br_startoff = rep_endoff; + got->br_blockcount -= rep->br_blockcount; + got->br_startblock += rep->br_blockcount; + +xfs_iext_update_extent (ip, state, icur, rep); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, got, state); +break ; +case BMAP_RIGHT_FILLING : +/* +* Replacing the last part of the mapping. Shorten the current +* mapping then add a record with the new mapping. +*/ + got->br_blockcount -= rep->br_blockcount; + +xfs_iext_update_extent (ip, state, icur, got); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, rep, state); +break ; +case 0 : +/* +* Replacing the middle of the extent. Shorten the current +* mapping, add a new record with the new mapping, and add a +* second new record with the tail of the old mapping. +*/ + got->br_blockcount = rep->br_startoff - got->br_startoff; + +struct xfs_bmbt_irec new = { + .br_startoff = rep_endoff, + .br_blockcount = got_endoff - rep_endoff, + .br_state = got->br_state, + .br_startblock = got->br_startblock + + rep->br_blockcount + + got->br_blockcount, + }; + +xfs_iext_update_extent (ip, state, icur, got); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, rep, state); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, &new, state); +break ; } - -/* -* The new extent can replace the beginning of the COW fork record. -* Move the left side of @got upwards, then insert the new record. -*/ - new.br_startoff += repl->len; - new.br_startblock += repl->len; - new.br_blockcount -= repl->len; -xfs_iext_update_extent (ip,BMAP_COWFORK , icur, &new); - - new.br_startoff = got->br_startoff; - new.br_startblock = repl->fsbno; - new.br_blockcount = repl->len; -xfs_iext_insert (ip, icur, &new,BMAP_COWFORK ); }/*
@@ -553,33 +615,30 @@ xrep_cow_replace_range( xfs_extlen_t *blockcount) {struct xfs_iext_cursor icur; -struct xrep_cow_extent repl; -struct xfs_bmbt_irec got; +struct xfs_bmbt_irec got, rep;struct xfs_scrub *sc = xc->sc; -xfs_fileoff_t nextoff; -xfs_extlen_t alloc_len; +xfs_fsblock_t old_fsbno;int error;/* -* Put the existing CoW fork mapping in @got. If @got ends before -* @rep, truncate @rep so we only replace one extent mapping at a time. +* Put the existing CoW fork mapping in @got, and put in @rep the +* contents of @got trimmed to @startoff/@blockcount. We only want +* to replace the bad region, and only one mapping at a time. */ - error =xrep_cow_find_mapping (xc, &icur, startoff, &got); + error =xrep_cow_find_mapping (xc, &icur, startoff, *blockcount, &got, + &rep);if (error)return error; - nextoff =min (startoff + *blockcount, - got.br_startoff + got.br_blockcount); + old_fsbno = rep.br_startblock;/* * Allocate a replacement extent. If we don't fill all the blocks, * shorten the quantity that will be deleted in this step. */ - alloc_len =min_t (xfs_fileoff_t,XFS_MAX_BMBT_EXTLEN , - nextoff - startoff);if (XFS_IS_REALTIME_INODE (sc->ip)) - error =xrep_cow_alloc_rt (sc, alloc_len, &repl); + error =xrep_cow_alloc_rt (sc, &rep);else - error =xrep_cow_alloc (sc, alloc_len, &repl); + error =xrep_cow_alloc (sc, &rep);if (error)return error;
@@ -587,7 +646,7 @@ xrep_cow_replace_range(* Replace the old mapping with the new one, and commit the metadata * changes made so far. */ -xrep_cow_replace_mapping (sc->ip, &icur, &got, &repl); +xrep_cow_replace_mapping (sc->ip, &icur, &got, &rep);xfs_inode_set_cowblocks_tag (sc->ip); error =xfs_defer_finish (&sc->tp);
@@ -596,15 +655,15 @@ xrep_cow_replace_range(/* Note the old CoW staging extents; we'll reap them all later. */ if (XFS_IS_REALTIME_INODE (sc->ip)) - error =xrtb_bitmap_set (&xc->old_cowfork_rtblocks, - got.br_startblock, repl.len); + error =xrtb_bitmap_set (&xc->old_cowfork_rtblocks, old_fsbno, + rep.br_blockcount);else - error =xfsb_bitmap_set (&xc->old_cowfork_fsblocks, - got.br_startblock, repl.len); + error =xfsb_bitmap_set (&xc->old_cowfork_fsblocks, old_fsbno, + rep.br_blockcount);if (error)return error; - *blockcount = repl.len; + *blockcount = rep.br_blockcount;return 0 ; }
fs/xfs/scrub/trace.h +17 -11
@@ -2672,9 +2672,9 @@ TRACE_EVENT(xrep_cow_mark_file_range, ); TRACE_EVENT(xrep_cow_replace_mapping, - TP_PROTO(struct xfs_inode *ip, const struct xfs_bmbt_irec *irec, - xfs_fsblock_t new_startblock, xfs_extlen_t new_blockcount), - TP_ARGS(ip, irec, new_startblock, new_blockcount), + TP_PROTO(struct xfs_inode *ip, const struct xfs_bmbt_irec *got, + const struct xfs_bmbt_irec *rep), + TP_ARGS(ip, got, rep), TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_ino_t, ino)
@@ -2682,28 +2682,34 @@ TRACE_EVENT(xrep_cow_replace_mapping, __field(xfs_fileoff_t, startoff) __field(xfs_filblks_t, blockcount) __field(xfs_exntst_t, state) + __field(xfs_fileoff_t, new_startoff) __field(xfs_fsblock_t, new_startblock) __field(xfs_extlen_t, new_blockcount) +__field (xfs_exntst_t, new_state) ),TP_fast_assign ( __entry->dev = ip->i_mount->m_super->s_dev; __entry->ino =I_INO (ip); - __entry->startoff = irec->br_startoff; - __entry->startblock = irec->br_startblock; - __entry->blockcount = irec->br_blockcount; - __entry->state = irec->br_state; - __entry->new_startblock = new_startblock; - __entry->new_blockcount = new_blockcount; + __entry->startoff = got->br_startoff; + __entry->startblock = got->br_startblock; + __entry->blockcount = got->br_blockcount; + __entry->state = got->br_state; + __entry->new_startoff = rep->br_startoff; + __entry->new_startblock = rep->br_startblock; + __entry->new_blockcount = rep->br_blockcount; + __entry->new_state = rep->br_state; ), -TP_printk ("dev %d:%d ino 0x%llx startoff 0x%llx startblock 0x%llx fsbcount 0x%llx state 0x%x new_startblock 0x%llx new_fsbcount 0x%x" , +TP_printk ("dev %d:%d ino 0x%llx startoff 0x%llx startblock 0x%llx fsbcount 0x%llx state 0x%x new_startoff 0x%llx new_startblock 0x%llx new_fsbcount 0x%x new_state 0x%x" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->ino, __entry->startoff, __entry->startblock, __entry->blockcount, __entry->state, + __entry->new_startoff, __entry->new_startblock, - __entry->new_blockcount) + __entry->new_blockcount, + __entry->new_state) ); TRACE_EVENT(xrep_cow_free_staging,
Sasha Levin
maintainerPATCH 1/2 xfs: factor out xfs_attr3_leaf_init
From: Long Li <[email protected]>
[ Upstream commit e65bb55d7f8c2041c8fdb73cd29b0b4cad4ed847 ]
Factor out wrapper xfs_attr3_leaf_init function, which exported for external use.
Stable-dep-of: a1caeeadbf57 ("xfs: don't replace the wrong part of the cow fork")
--- fs/xfs/libxfs/xfs_attr_leaf.c | 22 ++++++++++++++++++++++ fs/xfs/libxfs/xfs_attr_leaf.h | 3 +++ 2 files changed, 25 insertions(+)
fs/xfs/libxfs/xfs_attr_leaf.c +22 -0
@@ -1329,6 +1329,28 @@ xfs_attr3_leaf_create(return 0 ; } +/* +* Reinitialize an existing attr fork block as an empty leaf, and attach +* the buffer to tp. +*/ +int +xfs_attr3_leaf_init ( +struct xfs_trans *tp, +struct xfs_inode *dp, +xfs_dablk_t blkno) +{ +struct xfs_buf *bp =NULL ; +struct xfs_da_args args = { + .trans = tp, + .dp = dp, + .owner = dp->i_ino, + .geo = dp->i_mount->m_attr_geo, + }; + +ASSERT (tp !=NULL ); + +return xfs_attr3_leaf_create (&args, blkno, &bp); +}/* * Split the leaf node, rebalance, then add the new entry. *
fs/xfs/libxfs/xfs_attr_leaf.h +3 -0
@@ -86,6 +86,9 @@ int xfs_attr3_leaf_list_int(struct xfs_buf *bp,/* * Routines used for shrinking the Btree. */ + +int xfs_attr3_leaf_init (struct xfs_trans *tp,struct xfs_inode *dp, +xfs_dablk_t blkno);int xfs_attr3_leaf_toosmall (struct xfs_da_state *state,int *retval); void xfs_attr3_leaf_unbalance(struct xfs_da_state *state, struct xfs_da_state_blk *drop_blk,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 xfs: don't replace the wrong part of the cow fork
From: "Darrick J. Wong" <[email protected]>
[ Upstream commit a1caeeadbf57ff86dfc3454398c46de86056a74e ]
LOLLM points out that xfs_iext_lookup_extent can return a @got where got->br_startoff < startoff. In this case, xrep_cow_replace_range replaces the entire mapping instead of just the part that had been marked bad in the bitmap, but advances the bitmap cursor in xrep_cow_replace by the amount replaced. As a result, we fail to replace the end of the bad range, and replace part of the good range.
Fix this by rewriting the replace method to handle replacing the middle of a cow fork mapping. This we do by returning both the current mapping as @got, and the subset of the mapping that we want to replace as @rep, using @rep to store the results of the new allocation, and comparing @rep to @got to figure out the exact transformations needed.
--- fs/xfs/scrub/cow_repair.c | 182 ++++++++++++++++++++++++-------------- fs/xfs/scrub/trace.h | 28 +++--- 2 files changed, 135 insertions(+), 75 deletions(-)
fs/xfs/scrub/cow_repair.c +118 -64
@@ -73,12 +73,6 @@ struct xrep_cow {unsigned int next_bno; }; -/* CoW staging extent. */ -struct xrep_cow_extent { -xfs_fsblock_t fsbno; -xfs_extlen_t len; -}; -/* * Mark the part of the file range that corresponds to the given physical * space. Caller must ensure that the physical range is within xc->irec.
@@ -315,22 +309,21 @@ xrep_cow_find_bad( STATIC intxrep_cow_alloc (struct xfs_scrub *sc, -xfs_extlen_t maxlen, -struct xrep_cow_extent *repl) +struct xfs_bmbt_irec *del) {struct xfs_alloc_arg args = { .tp = sc->tp, .mp = sc->mp, .oinfo =XFS_RMAP_OINFO_SKIP_UPDATE , .minlen =1 , - .maxlen = maxlen, + .maxlen = del->br_blockcount, .prod =1 , .resv =XFS_AG_RESV_NONE , .datatype =XFS_ALLOC_USERDATA , };int error; - error =xfs_trans_reserve_more (sc->tp, maxlen,0 ); + error =xfs_trans_reserve_more (sc->tp, del->br_blockcount,0 );if (error)return error;
@@ -343,8 +336,8 @@ xrep_cow_alloc(xfs_refcount_alloc_cow_extent (sc->tp, args.fsbno, args.len); - repl->fsbno = args.fsbno; - repl->len = args.len; + del->br_startblock = args.fsbno; + del->br_blockcount = args.len;return 0 ; }
@@ -358,19 +351,19 @@ static inline intxrep_cow_find_mapping ( struct xrep_cow *xc, struct xfs_iext_cursor *icur, - xfs_fileoff_t startoff, - struct xfs_bmbt_irec *got) + xfs_fileoff_t badoff, + xfs_extlen_t badlen, + struct xfs_bmbt_irec *got, + struct xfs_bmbt_irec *rep) { struct xfs_inode *ip = xc->sc->ip;struct xfs_ifork *ifp =xfs_ifork_ptr (ip,XFS_COW_FORK ); -if (!xfs_iext_lookup_extent (ip, ifp, startoff, icur, got)) +if (!xfs_iext_lookup_extent (ip, ifp, badoff, icur, got)) goto bad; +memcpy (rep, got,sizeof (*rep)); -if (got->br_startoff > startoff) - goto bad; - -if (got->br_blockcount ==0 ) +if (got->br_startoff > badoff) goto bad;if (isnullstartblock (got->br_startblock))
@@ -379,6 +372,24 @@ xrep_cow_find_mapping(if (xfs_bmap_is_written_extent (got)) goto bad; +if (got->br_startoff < badoff) { +const int64_t delta = badoff - got->br_startoff; + + rep->br_blockcount -= delta; + rep->br_startoff += delta; + rep->br_startblock += delta; + } + +if (got->br_startoff + got->br_blockcount > badoff + badlen) { +const int64_t delta = (got->br_startoff + got->br_blockcount) - + (badoff + badlen); + + rep->br_blockcount -= delta; + } + +if (got->br_blockcount ==0 ) + goto bad; +return 0 ; bad:ASSERT (0 );
@@ -389,46 +400,92 @@ xrep_cow_find_mapping(#define REPLACE_RIGHT_SIDE (1U << 1)/* -* Given a CoW fork mapping @got and a replacement mapping @repl, remap the -* beginning of @got with the space described by @rep. +* Given a CoW fork mapping @got and a replacement mapping @rep, map the space +* described by @rep into the cow fork, pushing aside @got as necessary. @icur +* must point to iext tree leaf containing @got. */ static inline void xrep_cow_replace_mapping ( -struct xfs_inode *ip, -struct xfs_iext_cursor *icur, -const struct xfs_bmbt_irec *got, -const struct xrep_cow_extent *repl) +struct xfs_inode *ip, +struct xfs_iext_cursor *icur, +struct xfs_bmbt_irec *got, +struct xfs_bmbt_irec *rep) { -struct xfs_bmbt_irec new = *got;/* struct copy */ +struct xfs_ifork *ifp =xfs_ifork_ptr (ip,XFS_COW_FORK ); +xfs_fileoff_t rep_endoff = + rep->br_startoff + rep->br_blockcount; +xfs_fileoff_t got_endoff = + got->br_startoff + got->br_blockcount; +uint32_t state =BMAP_COWFORK ; -ASSERT (repl->len >0 ); +ASSERT (rep->br_blockcount >0 );ASSERT (!isnullstartblock (got->br_startblock)); +ASSERT (got->br_startoff <= rep->br_startoff); +ASSERT (got_endoff >= rep_endoff); + +trace_xrep_cow_replace_mapping (ip, got, rep); -trace_xrep_cow_replace_mapping (ip, got, repl->fsbno, repl->len); +if (got->br_startoff == rep->br_startoff) + state |=BMAP_LEFT_FILLING ; +if (got_endoff == rep_endoff) + state |=BMAP_RIGHT_FILLING ; -if (got->br_blockcount == repl->len) { +switch (state & (BMAP_LEFT_FILLING |BMAP_RIGHT_FILLING )) { +case BMAP_LEFT_FILLING |BMAP_RIGHT_FILLING :/* -* The new extent is a complete replacement for the existing -* extent. Update the COW fork record. +* Replacement matches the whole mapping, update the record. */ - new.br_startblock = repl->fsbno; -xfs_iext_update_extent (ip,BMAP_COWFORK , icur, &new); -return ; - } +xfs_iext_update_extent (ip, state, icur, rep); +break ; +case BMAP_LEFT_FILLING : +/* +* Replace the first part of the mapping: Update the cursor +* position with the new mapping, then add a record with the +* tail of the old mapping. +*/ + got->br_startoff = rep_endoff; + got->br_blockcount -= rep->br_blockcount; + got->br_startblock += rep->br_blockcount; + +xfs_iext_update_extent (ip, state, icur, rep); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, got, state); +break ; +case BMAP_RIGHT_FILLING : +/* +* Replacing the last part of the mapping. Shorten the current +* mapping then add a record with the new mapping. +*/ + got->br_blockcount -= rep->br_blockcount; -/* -* The new extent can replace the beginning of the COW fork record. -* Move the left side of @got upwards, then insert the new record. -*/ - new.br_startoff += repl->len; - new.br_startblock += repl->len; - new.br_blockcount -= repl->len; -xfs_iext_update_extent (ip,BMAP_COWFORK , icur, &new); - - new.br_startoff = got->br_startoff; - new.br_startblock = repl->fsbno; - new.br_blockcount = repl->len; -xfs_iext_insert (ip, icur, &new,BMAP_COWFORK ); +xfs_iext_update_extent (ip, state, icur, got); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, rep, state); +break ; +case 0 : +/* +* Replacing the middle of the extent. Shorten the current +* mapping, add a new record with the new mapping, and add a +* second new record with the tail of the old mapping. +*/ + got->br_blockcount = rep->br_startoff - got->br_startoff; + +struct xfs_bmbt_irec new = { + .br_startoff = rep_endoff, + .br_blockcount = got_endoff - rep_endoff, + .br_state = got->br_state, + .br_startblock = got->br_startblock + + rep->br_blockcount + + got->br_blockcount, + }; + +xfs_iext_update_extent (ip, state, icur, got); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, rep, state); +xfs_iext_next (ifp, icur); +xfs_iext_insert (ip, icur, &new, state); +break ; + } }/*
@@ -442,30 +499,27 @@ xrep_cow_replace_range( xfs_extlen_t *blockcount) {struct xfs_iext_cursor icur; -struct xrep_cow_extent repl; -struct xfs_bmbt_irec got; +struct xfs_bmbt_irec got, rep;struct xfs_scrub *sc = xc->sc; -xfs_fileoff_t nextoff; -xfs_extlen_t alloc_len; +xfs_fsblock_t old_fsbno;int error;/* -* Put the existing CoW fork mapping in @got. If @got ends before -* @rep, truncate @rep so we only replace one extent mapping at a time. +* Put the existing CoW fork mapping in @got, and put in @rep the +* contents of @got trimmed to @startoff/@blockcount. We only want +* to replace the bad region, and only one mapping at a time. */ - error =xrep_cow_find_mapping (xc, &icur, startoff, &got); + error =xrep_cow_find_mapping (xc, &icur, startoff, *blockcount, &got, + &rep);if (error)return error; - nextoff =min (startoff + *blockcount, - got.br_startoff + got.br_blockcount); + old_fsbno = rep.br_startblock;/* * Allocate a replacement extent. If we don't fill all the blocks, * shorten the quantity that will be deleted in this step. */ - alloc_len =min_t (xfs_fileoff_t,XFS_MAX_BMBT_EXTLEN , - nextoff - startoff); - error =xrep_cow_alloc (sc, alloc_len, &repl); + error =xrep_cow_alloc (sc, &rep);if (error)return error;
@@ -473,7 +527,7 @@ xrep_cow_replace_range(* Replace the old mapping with the new one, and commit the metadata * changes made so far. */ -xrep_cow_replace_mapping (sc->ip, &icur, &got, &repl); +xrep_cow_replace_mapping (sc->ip, &icur, &got, &rep);xfs_inode_set_cowblocks_tag (sc->ip); error =xfs_defer_finish (&sc->tp);
@@ -481,12 +535,12 @@ xrep_cow_replace_range(return error;/* Note the old CoW staging extents; we'll reap them all later. */ - error =xfsb_bitmap_set (&xc->old_cowfork_fsblocks, got.br_startblock, - repl.len); + error =xfsb_bitmap_set (&xc->old_cowfork_fsblocks, old_fsbno, + rep.br_blockcount);if (error)return error; - *blockcount = repl.len; + *blockcount = rep.br_blockcount;return 0 ; }
fs/xfs/scrub/trace.h +17 -11
@@ -2553,9 +2553,9 @@ TRACE_EVENT(xrep_cow_mark_file_range, ); TRACE_EVENT(xrep_cow_replace_mapping, - TP_PROTO(struct xfs_inode *ip, const struct xfs_bmbt_irec *irec, - xfs_fsblock_t new_startblock, xfs_extlen_t new_blockcount), - TP_ARGS(ip, irec, new_startblock, new_blockcount), + TP_PROTO(struct xfs_inode *ip, const struct xfs_bmbt_irec *got, + const struct xfs_bmbt_irec *rep), + TP_ARGS(ip, got, rep), TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_ino_t, ino)
@@ -2563,28 +2563,34 @@ TRACE_EVENT(xrep_cow_replace_mapping, __field(xfs_fileoff_t, startoff) __field(xfs_filblks_t, blockcount) __field(xfs_exntst_t, state) + __field(xfs_fileoff_t, new_startoff) __field(xfs_fsblock_t, new_startblock) __field(xfs_extlen_t, new_blockcount) +__field (xfs_exntst_t, new_state) ),TP_fast_assign ( __entry->dev = ip->i_mount->m_super->s_dev; __entry->ino = ip->i_ino; - __entry->startoff = irec->br_startoff; - __entry->startblock = irec->br_startblock; - __entry->blockcount = irec->br_blockcount; - __entry->state = irec->br_state; - __entry->new_startblock = new_startblock; - __entry->new_blockcount = new_blockcount; + __entry->startoff = got->br_startoff; + __entry->startblock = got->br_startblock; + __entry->blockcount = got->br_blockcount; + __entry->state = got->br_state; + __entry->new_startoff = rep->br_startoff; + __entry->new_startblock = rep->br_startblock; + __entry->new_blockcount = rep->br_blockcount; + __entry->new_state = rep->br_state; ), -TP_printk ("dev %d:%d ino 0x%llx startoff 0x%llx startblock 0x%llx fsbcount 0x%llx state 0x%x new_startblock 0x%llx new_fsbcount 0x%x" , +TP_printk ("dev %d:%d ino 0x%llx startoff 0x%llx startblock 0x%llx fsbcount 0x%llx state 0x%x new_startoff 0x%llx new_startblock 0x%llx new_fsbcount 0x%x new_state 0x%x" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->ino, __entry->startoff, __entry->startblock, __entry->blockcount, __entry->state, + __entry->new_startoff, __entry->new_startblock, - __entry->new_blockcount) + __entry->new_blockcount, + __entry->new_state) ); TRACE_EVENT(xrep_cow_free_staging,
Signature · 1 line
2.53.0