FAILED: patch "[PATCH] xfs: initialize iomap->flags earlier in xfs_bmbt_to_iomap" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.18-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.18.y
git checkout FETCH_HEAD
git cherry-pick -x 327e58826eb72f8bae9419cf1a4e722b57c85694
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071455-siberian-quote-a146@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 327e58826eb72f8bae9419cf1a4e722b57c85694 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Tue, 9 Jun 2026 09:53:44 +0200
Subject: [PATCH] xfs: initialize iomap->flags earlier in xfs_bmbt_to_iomap
Otherwise we lose the IOMAP_IOEND_BOUNDARY assingment for writes to the first block in a realtime group, and could cause incorrect merges for such writes.
fs/xfs/xfs_iomap.c +1 -1
@@ -113,6 +113,7 @@ xfs_bmbt_to_iomap(return xfs_alert_fsblock_zero (ip, imap); } + iomap->flags = iomap_flags;if (imap->br_startblock ==HOLESTARTBLOCK ) { iomap->addr =IOMAP_NULL_ADDR ; iomap->type =IOMAP_HOLE ;
@@ -143,7 +144,6 @@ xfs_bmbt_to_iomap( } iomap->offset =XFS_FSB_TO_B (mp, imap->br_startoff); iomap->length =XFS_FSB_TO_B (mp, imap->br_blockcount); - iomap->flags = iomap_flags;if (mapping_flags &IOMAP_DAX ) { iomap->dax_dev = target->bt_daxdev; }else {
Sasha Levin
maintainerPATCH 1/1 xfs: initialize iomap->flags earlier in xfs_bmbt_to_iomap
From: Christoph Hellwig <[email protected]>
[ Upstream commit 327e58826eb72f8bae9419cf1a4e722b57c85694 ]
Otherwise we lose the IOMAP_IOEND_BOUNDARY assingment for writes to the first block in a realtime group, and could cause incorrect merges for such writes.
--- fs/xfs/xfs_iomap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_iomap.c +1 -1
@@ -113,6 +113,7 @@ xfs_bmbt_to_iomap(return xfs_alert_fsblock_zero (ip, imap); } + iomap->flags = iomap_flags;if (imap->br_startblock ==HOLESTARTBLOCK ) { iomap->addr =IOMAP_NULL_ADDR ; iomap->type =IOMAP_HOLE ;
@@ -147,7 +148,6 @@ xfs_bmbt_to_iomap( iomap->dax_dev = target->bt_daxdev; else iomap->bdev = target->bt_bdev; - iomap->flags = iomap_flags;/* * If the inode is dirty for datasync purposes, let iomap know so it
Signature · 1 line
2.53.0