Commit 92573369 authored by Ojaswin Mujoo's avatar Ojaswin Mujoo Committed by Theodore Ts'o
Browse files

ext4: treat end of range as exclusive in ext4_zero_range() 



The call to filemap_write_and_wait_range() assumes the range passed to be
inclusive, so fix the call to make sure we follow that.

Signed-off-by: default avatarOjaswin Mujoo <ojaswin@linux.ibm.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/e503107a7c73a2b68dec645c5ad798c437717c45.1698856309.git.ojaswin@linux.ibm.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent e89fdcc4

fs/ext4/extents.c

+4 −2
Original line number Diff line number Diff line
@@ -4523,7 +4523,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
	 * Round up offset. This is not fallocate, we need to zero out

	 * blocks, so convert interior block aligned part of the range to

	 * unwritten and possibly manually zero out unaligned parts of the

	 * range.

	 * range. Here, start and partial_begin are inclusive, end and

	 * partial_end are exclusive.

	 */

	start = round_up(offset, 1 << blkbits);

	end = round_down((offset + len), 1 << blkbits);
@@ -4609,7 +4610,8 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		 * disk in case of crash before zeroing trans is committed.

		 */

		if (ext4_should_journal_data(inode)) {

			ret = filemap_write_and_wait_range(mapping, start, end);

			ret = filemap_write_and_wait_range(mapping, start,

							   end - 1);

			if (ret) {

				filemap_invalidate_unlock(mapping);

				goto out_mutex;