[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: d69bee6a35d3c5e4873b9e164dd1a9711351a97c
WARNING: Author mismatch between patch and upstream commit: Backport author: Leah Rumancikleah.rumancik@gmail.com Commit author: Christoph Hellwighch@lst.de
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: 4bcef72d96b5)
Note: The patch differs from the upstream commit: --- 1: d69bee6a35d3c ! 1: 2cb51f69d0955 xfs: fix xfs_bmap_add_extent_delay_real for partial conversions @@ Metadata ## Commit message ## xfs: fix xfs_bmap_add_extent_delay_real for partial conversions
+ [ Upstream commit d69bee6a35d3c5e4873b9e164dd1a9711351a97c ] + xfs_bmap_add_extent_delay_real takes parts or all of a delalloc extent and converts them to a real extent. It is written to deal with any potential overlap of the to be converted range with the delalloc extent, @@ Commit message Signed-off-by: Christoph Hellwig hch@lst.de Reviewed-by: "Darrick J. Wong" djwong@kernel.org Signed-off-by: Chandan Babu R chandanbabu@kernel.org + Signed-off-by: Leah Rumancik leah.rumancik@gmail.com + Acked-by: "Darrick J. Wong" djwong@kernel.org
## fs/xfs/libxfs/xfs_bmap.c ## @@ fs/xfs/libxfs/xfs_bmap.c: xfs_bmap_add_extent_delay_real( @@ fs/xfs/libxfs/xfs_bmap.c: xfs_bmap_add_extent_delay_real( }
/* adjust for changes in reserved delayed indirect blocks */ -- if (da_new < da_old) { -+ if (da_new < da_old) - xfs_add_fdblocks(mp, da_old - da_new); -- } else if (da_new > da_old) { -- ASSERT(state == 0); -- error = xfs_dec_fdblocks(mp, da_new - da_old, false); +- if (da_new != da_old) { +- ASSERT(state == 0 || da_new < da_old); ++ if (da_new != da_old) + error = xfs_mod_fdblocks(mp, (int64_t)(da_old - da_new), +- false); - } -+ else if (da_new > da_old) -+ error = xfs_dec_fdblocks(mp, da_new - da_old, true); ++ true);
xfs_bmap_check_leaf_extents(bma->cur, bma->ip, whichfork); done: ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |