Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795054563; b=1o3DeVRrv0gBN+3oTQLCY+mZrSWQBPz+XjrEaTwQWCvANe8bg3zs+8oLlREsGtb3najf qelnBRgLepYICpeoos0yYikZ8zyehLIFMIK7ziQyoE6BTDOM6Qv+/quimqfMxjRp4mjPx VPrz98C+WTY0Qc0dt9MztMUITgudFdSIBoCVZVCF+zn4rJhfo1XRqdeVN69zL3skd5Unr 9KgNP+ayaVO8hhKs74r+1JWkERJfAD+8TdQ2enEA3BEpBLaAqSHxTE6vTndeDneu2m3fx GVoeao94NekRGOiC+zzXM9YurC9/ba3IrY+xLu/0GULIyaj4ouetSRzQmZFRvJJoVAQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054563; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=D+7HAUDx57nTy/bRJdOM19yGRM0hCDnC4LQqhhICqFg=; b=UwQtbJwhgrKFz0+w1zZYjV5AXuQNP6mJofQ0ITyx7pS1FFUqKQg5pfBSbXm01xRD0IJb i8G2q4ZY0zkD/ikxS0RPCLhsh9oEAwhwGcJNv2HxTw0x2TnUUYvEesL6645dWc9v743CU 9BzsOgQYEbiDlTeJZFUP9U+BxKB/DR32WfEGS5kJVHy5jtJMf2OiZxZl0gr6Dy7IIJM5j Sgww8jz5ieTvEQbMyvJEH1qpFobbj+g89ca+Ah3J8+/qcr6h8Tx3wh1cvnZx4jOZpe/x+ ZrSNn/Vm1nAhk29mY+pGopnpUpx0ZUDgacittD3iyT7Hxp3jzS9Xq2S0P+/QNbcaYPw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=W3IfZs89; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B859A606A31C; Thu, 19 Nov 2026 02:16:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=W3IfZs89 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15E551F000C4; Thu, 19 Nov 2026 02:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054563; bh=D+7HAUDx57nTy/bRJdOM19yGRM0hCDnC4LQqhhICqFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W3IfZs89Je52Ly0kGqRVulY66HuNXckxD9fBryJCkKbyxeAztbthqnpDk/0O9F6gd GYxfUMcAm+kxkawlHRQsD8s+fUnlmkisK2XFoZjhSfyYZ7mWaP/lj3tDLcdya45cq/ bScrR6IWXgxjt/OJQoZ+Xx2oN0vj8m7WW+vYQyKw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Daejun Park , Pankaj Raghav , Carlos Maiolino , Sasha Levin Subject: [PATCH 5.15 1318/2214] xfs: add a flag to convert unwritten extents without allocating blocks Date: Wed, 18 Nov 2026 15:49:54 +0100 Message-ID: <20261118150104.194916953@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daejun Park [ 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. Suggested-by: Christoph Hellwig Link: https://lore.kernel.org/r/20261013120359.GB2944@lst.de Cc: stable@vger.kernel.org Signed-off-by: Daejun Park Reviewed-by: Christoph Hellwig Reviewed-by: Pankaj Raghav Signed-off-by: Carlos Maiolino [ sashal: Restricted -ENOSR returns for empty mappings to CONVERT_ONLY requests to preserve existing callers' behavior. ] Signed-off-by: Sasha Levin --- fs/xfs/libxfs/xfs_bmap.c | 12 ++++++++++++ fs/xfs/libxfs/xfs_bmap.h | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index b48230f1a3619..80208265dee57 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -4355,6 +4355,8 @@ xfs_bmapi_finish( * extent state if necessary. Details behaviour is controlled by the flags * parameter. Only allocates blocks from a single allocation group, to avoid * locking problems. + * 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( @@ -4414,6 +4416,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(false, mp, XFS_ERRTAG_BMAPIFORMAT)) { @@ -4461,6 +4465,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; @@ -4535,6 +4542,11 @@ xfs_bmapi_write( xfs_bmapi_finish(&bma, whichfork, 0); xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval, orig_nmap, *nmap); + + if (!n && (flags & XFS_BMAPI_CONVERT_ONLY)) { + ASSERT(bma.nallocs == 0); + return -ENOSR; + } return 0; error0: xfs_bmapi_finish(&bma, whichfork, error); diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h index 67641f669918f..1c234d587c516 100644 --- a/fs/xfs/libxfs/xfs_bmap.h +++ b/fs/xfs/libxfs/xfs_bmap.h @@ -101,6 +101,13 @@ struct xfs_extent_free_item /* Do not update the rmap btree. Used for reconstructing bmbt from rmapbt. */ #define XFS_BMAPI_NORMAP 0x2000 +/* + * 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 0x4000 + #define XFS_BMAPI_FLAGS \ { XFS_BMAPI_ENTIRE, "ENTIRE" }, \ { XFS_BMAPI_METADATA, "METADATA" }, \ @@ -112,7 +119,8 @@ struct xfs_extent_free_item { XFS_BMAPI_REMAP, "REMAP" }, \ { XFS_BMAPI_COWFORK, "COWFORK" }, \ { XFS_BMAPI_NODISCARD, "NODISCARD" }, \ - { XFS_BMAPI_NORMAP, "NORMAP" } + { XFS_BMAPI_NORMAP, "NORMAP" }, \ + { XFS_BMAPI_CONVERT_ONLY, "CONVERT_ONLY" } static inline int xfs_bmapi_aflag(int w) -- 2.53.0