ntfs: fix FITRIM range alignment
PATCH 1/1 ntfs: fix FITRIM range alignment
ntfs_trim_fs() aligns the start of a free extent up to the device discard granularity, but derives the discard length by aligning the original extent length down. When the free extent start is not discard-aligned, adding that length to the aligned start can extend the discard past the free extent and into allocated clusters.
For example, with 4 KiB clusters and 32 KiB discard granularity, the free extent [4 KiB, 36 KiB) becomes the discard range [32 KiB, 64 KiB), so 28 KiB beyond the free extent may be discarded.
Align the absolute end of the free extent down and derive the length from the two aligned endpoints. Skip extents that contain no full discard unit.
Reproduced with a 4 KiB-cluster NTFS filesystem on scsi_debug configured for 32 KiB discard granularity and read-zero-after-trim. Before this change, FITRIM zeroed seven allocated 4 KiB clusters following an unaligned 32 KiB hole. With this change, the same data remains intact across FITRIM and remount.
--- fs/ntfs/bitmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/ntfs/bitmap.c +5 -3
@@ -64,7 +64,7 @@ int ntfs_trim_fs(struct ntfs_volume *vol, struct fstrim_range *range) end = start_buf;while (end < end_buf) { -u64 aligned_start, aligned_count; +u64 aligned_start, aligned_end, aligned_count;u64 start =find_next_zero_bit (bitmap, end_buf - start_buf, end - start_buf) + start_buf;if (start >= end_buf)
@@ -74,8 +74,10 @@ int ntfs_trim_fs(struct ntfs_volume *vol, struct fstrim_range *range) start - start_buf) + start_buf; aligned_start =ALIGN (ntfs_cluster_to_bytes (vol, start), dq); - aligned_count = -ALIGN_DOWN (ntfs_cluster_to_bytes (vol, end - start), dq); + aligned_end =ALIGN_DOWN (ntfs_cluster_to_bytes (vol, end), dq); +if (aligned_start >= aligned_end) +continue ; + aligned_count = aligned_end - aligned_start;if (aligned_count >= range->minlen) { ret =blkdev_issue_discard (vol->sb->s_bdev, aligned_start >>9 , aligned_count >>9 ,GFP_NOFS );
base-commit: ac727d86fb84bdc9626ba9c756c26767459f3083
Signature · 1 line
2.55.0
Quoted 20 lines · Jacopo Labardi
ntfs_trim_fs()aligns the start of a free extent up to the device discard granularity, but derives the discard length by aligning the original extent length down. When the free extent start is not discard-aligned, adding that length to the aligned start can extend the discard past the free extent and into allocated clusters.For example, with 4 KiB clusters and 32 KiB discard granularity, the free extent [4 KiB, 36 KiB) becomes the discard range [32 KiB, 64 KiB), so 28 KiB beyond the free extent may be discarded.
Align the absolute end of the free extent down and derive the length from the two aligned endpoints. Skip extents that contain no full discard unit.
Reproduced with a 4 KiB-cluster NTFS filesystem on
scsi_debugconfigured for 32 KiB discard granularity and read-zero-after-trim. Before this change, FITRIM zeroed seven allocated 4 KiB clusters following an unaligned 32 KiB hole. With this change, the same data remains intact across FITRIM and remount.
Quoted 4 lines
Fixes 11ccc9107dc4 ("ntfs: update runlist handling and cluster allocator")Assisted-by OpenAI Codex:GPT-5.6 Sol MaxSigned-off-by Jacopo Labardi <[email protected]>
Applied it to #ntfs-next.
Thanks!