Commit 5e4d0eba authored by Xin Yin's avatar Xin Yin Committed by Theodore Ts'o
Browse files

ext4: fix fast commit may miss tracking range for FALLOC_FL_ZERO_RANGE 



when call falloc with FALLOC_FL_ZERO_RANGE, to set an range to unwritten,
which has been already initialized. If the range is align to blocksize,
fast commit will not track range for this change.

Also track range for unwritten range in ext4_map_blocks().

Signed-off-by: default avatarXin Yin <yinxin.x@bytedance.com>
Reviewed-by: default avatarHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Link: https://lore.kernel.org/r/20211221022839.374606-1-yinxin.x@bytedance.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
parent d1199b94

fs/ext4/extents.c

+0 −2
Original line number Diff line number Diff line
@@ -4647,8 +4647,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
	ret = ext4_mark_inode_dirty(handle, inode);

	if (unlikely(ret))

		goto out_handle;

	ext4_fc_track_range(handle, inode, offset >> inode->i_sb->s_blocksize_bits,

			(offset + len - 1) >> inode->i_sb->s_blocksize_bits);

	/* Zero out partial block at the edges of the range */

	ret = ext4_zero_partial_blocks(handle, inode, offset, len);

	if (ret >= 0)

fs/ext4/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -741,10 +741,11 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 
			if (ret)

				return ret;

		}

	}

	if (retval > 0 && (map->m_flags & EXT4_MAP_UNWRITTEN ||

				map->m_flags & EXT4_MAP_MAPPED))

		ext4_fc_track_range(handle, inode, map->m_lblk,

					map->m_lblk + map->m_len - 1);

	}



	if (retval < 0)

		ext_debug(inode, "failed with err %d\n", retval);

	return retval;