FAILED: patch "[PATCH] ext4: write back partial-zeroed edges in WRITE_ZEROES" failed to apply to 7.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 7.1-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-7.1.y
git checkout FETCH_HEAD
git cherry-pick -x d19d239ada9b7c92d086a1f051b7566538ee0089
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082452-contact-marsupial-dc79@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d19d239ada9b7c92d086a1f051b7566538ee0089 Mon Sep 17 00:00:00 2001
From: Zhang Yi <[email protected]>
Date: Tue, 14 Jul 2026 16:00:43 +0800
Subject: [PATCH] ext4: write back partial-zeroed edges in WRITE_ZEROES
FALLOC_FL_WRITE_ZEROES requires that all blocks in the requested range end up as written extents with zeroed content. For unaligned edges that were partial-zeroed in dirty unwritten or delalloc state, the buffer is left dirty while the underlying extent may not yet be converted to written. As a result, a subsequent SYNC write to this range would still trigger metadata changes, which violates the semantics of WRITE_ZEROES.
Fix this by calling filemap_write_and_wait_range() for partial-zeroed edges to flush out the zeroed data and ensure the extent conversion is complete.
fs/ext4/extents.c +9 -1
@@ -4791,7 +4791,15 @@ static long ext4_zero_range(struct file *file, loff_t offset,if (IS_ALIGNED (offset | end, blocksize))return ret; -if (((file->f_flags &O_SYNC ) ||IS_SYNC (inode)) && partial_zeroed) { +/* +* In FALLOC_FL_WRITE_ZEROES mode, edges that have been partially +* zeroed must be written back to ensure the entire zeroed range +* is converted to the written state. In SYNC mode, writeback is +* also required to persist the zeroed data to disk. +*/ +if (partial_zeroed && + ((mode &FALLOC_FL_WRITE_ZEROES ) || + (file->f_flags &O_SYNC ) ||IS_SYNC (inode))) { ret =filemap_write_and_wait_range (inode->i_mapping, offset, end -1 );if (ret)
Sasha Levin
maintainerPATCH 1/2 ext4: move partial block zeroing earlier in ext4_zero_range()
From: Zhang Yi <[email protected]>
[ Upstream commit b16e9d27a643a3cf8907c994d25ed52717f36418 ]
In ext4_zero_range(), move the ext4_zero_partial_blocks() call, which handles unaligned edges, into the same branch where the unaligned range is preallocated, immediately after ext4_alloc_file_blocks(). This is safe because there is no dependency between partial block handling and the subsequent full block handling.
This change will be used by later patches that handle unaligned FALLOC_FL_WRITE_ZEROES operations, which will need to check the partial zeroed result.
Stable-dep-of: d19d239ada9b ("ext4: write back partial-zeroed edges in WRITE_ZEROES")
--- fs/ext4/extents.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/ext4/extents.c +7 -5
@@ -4734,10 +4734,16 @@ static long ext4_zero_range(struct file *file, loff_t offset, } flags =EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT ; -/* Preallocate the range including the unaligned edges */ +/* +* Preallocate the range including the unaligned edges, and zero +* out partial blocks if they already contain data. +*/ if (!IS_ALIGNED (offset | end, blocksize)) { ret =ext4_alloc_file_blocks (file, offset, len, new_size, flags); +if (!ret) + ret =ext4_zero_partial_blocks (inode, offset, len, + &partial_zeroed);if (ret)return ret; }
@@ -4770,10 +4776,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,if (IS_ALIGNED (offset | end, blocksize))return ret; -/* Zero out partial block at the edges of the range */ - ret =ext4_zero_partial_blocks (inode, offset, len, &partial_zeroed); -if (ret) -return ret;if (((file->f_flags &O_SYNC ) ||IS_SYNC (inode)) && partial_zeroed) { ret =filemap_write_and_wait_range (inode->i_mapping, offset, end -1 );
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 ext4: write back partial-zeroed edges in WRITE_ZEROES
From: Zhang Yi <[email protected]>
[ Upstream commit d19d239ada9b7c92d086a1f051b7566538ee0089 ]
FALLOC_FL_WRITE_ZEROES requires that all blocks in the requested range end up as written extents with zeroed content. For unaligned edges that were partial-zeroed in dirty unwritten or delalloc state, the buffer is left dirty while the underlying extent may not yet be converted to written. As a result, a subsequent SYNC write to this range would still trigger metadata changes, which violates the semantics of WRITE_ZEROES.
Fix this by calling filemap_write_and_wait_range() for partial-zeroed edges to flush out the zeroed data and ensure the extent conversion is complete.
--- fs/ext4/extents.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/ext4/extents.c +9 -1
@@ -4776,7 +4776,15 @@ static long ext4_zero_range(struct file *file, loff_t offset,if (IS_ALIGNED (offset | end, blocksize))return ret; -if (((file->f_flags &O_SYNC ) ||IS_SYNC (inode)) && partial_zeroed) { +/* +* In FALLOC_FL_WRITE_ZEROES mode, edges that have been partially +* zeroed must be written back to ensure the entire zeroed range +* is converted to the written state. In SYNC mode, writeback is +* also required to persist the zeroed data to disk. +*/ +if (partial_zeroed && + ((mode &FALLOC_FL_WRITE_ZEROES ) || + (file->f_flags &O_SYNC ) ||IS_SYNC (inode))) { ret =filemap_write_and_wait_range (inode->i_mapping, offset, end -1 );if (ret)
Signature · 1 line
2.53.0