Patch "xfs: add a flag to convert unwritten extents without allocating blocks" has been added to the 7.3-stable tree
Sasha Levin
AppliedThis is a note to let you know that I've just added the patch titled
xfs: add a flag to convert unwritten extents without allocating blocks
to the 7.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xfs-add-a-flag-to-convert-unwritten-extents-without-.patch
and it can be found in the queue-7.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
commit 1a19c86b834bc065d23d3f621e0dc0c88d53c0ca
Author: Daejun Park <[email protected]> Date: Thu Oct 29 11:22:59 2026 +0900
xfs: add a flag to convert unwritten extents without allocating blocks
[ Upstream commit f3ca3498dfe624f9b604c934263538a3acd55af5 ]
xfs_bmapi_write() with XFS_BMAPI_CONVERT also allocates blocks for holes and delalloc extents in the range. Add XFS_BMAPI_CONVERT_ONLY for callers that may only convert already allocated blocks. It stops at a hole or delalloc extent, and returns -ENOSR if it stops before mapping anything.
Marked for stable because "xfs: refuse a pNFS LAYOUTCOMMIT of a range without blocks" needs it.
fs/xfs/libxfs/xfs_bmap.c +12 -2
@@ -4128,6 +4128,8 @@ xfs_bmapi_finish(* Returns a negative error code on failure, including -ENOSPC when it could not * allocate any blocks and -ENOSR when it did allocate blocks to convert a * delalloc range, but those blocks were before the passed in range. +* With XFS_BMAPI_CONVERT_ONLY, it stops at a hole or a delalloc extent instead +* of allocating blocks, and returns -ENOSR if it stops before mapping anything. */ int xfs_bmapi_write(
@@ -4187,6 +4189,8 @@ xfs_bmapi_write(*/ ASSERT ((flags & (XFS_BMAPI_PREALLOC |XFS_BMAPI_ZERO )) != (XFS_BMAPI_PREALLOC |XFS_BMAPI_ZERO )); +ASSERT (!(flags &XFS_BMAPI_CONVERT_ONLY ) || + (flags &XFS_BMAPI_CONVERT ));if (XFS_IS_CORRUPT (mp, !xfs_ifork_has_extents (ifp)) ||XFS_TEST_ERROR (mp,XFS_ERRTAG_BMAPIFORMAT )) {
@@ -4235,6 +4239,9 @@ xfs_bmapi_write(* that we found, if any. */ if (need_alloc || wasdelay) { +if (flags &XFS_BMAPI_CONVERT_ONLY ) +break ; + bma.eof = eof; bma.conv = !!(flags &XFS_BMAPI_CONVERT ); bma.wasdel = wasdelay;
@@ -4330,10 +4337,13 @@ xfs_bmapi_write(* * To avoid a successful return with *nmap set to 0, return the magic * -ENOSR error code for this particular case so that the caller can -* handle it. +* handle it. The same goes for XFS_BMAPI_CONVERT_ONLY stopping at a +* hole or a delalloc extent at the start of the range, in which case +* nothing has been changed. */ if (!n) { -ASSERT (bma.nallocs >= *nmap); +ASSERT ((flags &XFS_BMAPI_CONVERT_ONLY ) ? bma.nallocs ==0 : + bma.nallocs >= *nmap);return -ENOSR ; } *nmap = n;
fs/xfs/libxfs/xfs_bmap.h +9 -1
@@ -90,6 +90,13 @@ struct xfs_bmalloca {/* Try to align allocations to the extent size hint */ #define XFS_BMAPI_EXTSZALIGN (1u << 11) +/* +* Use with XFS_BMAPI_CONVERT to convert unwritten extents without allocating +* blocks. Stop at a hole or a delalloc extent: return the mappings found so +* far, or -ENOSR if there are none. +*/ +#define XFS_BMAPI_CONVERT_ONLY (1u << 12) +#define XFS_BMAPI_FLAGS \ { XFS_BMAPI_ENTIRE, "ENTIRE" }, \ { XFS_BMAPI_METADATA, "METADATA" }, \
@@ -102,7 +109,8 @@ struct xfs_bmalloca { { XFS_BMAPI_COWFORK, "COWFORK" }, \ { XFS_BMAPI_NODISCARD, "NODISCARD" }, \ { XFS_BMAPI_NORMAP, "NORMAP" },\ - { XFS_BMAPI_EXTSZALIGN, "EXTSZALIGN" } + { XFS_BMAPI_EXTSZALIGN, "EXTSZALIGN" }, \ + { XFS_BMAPI_CONVERT_ONLY, "CONVERT_ONLY" } static inline int xfs_bmapi_aflag(int w)