Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4255c224 authored by Xiaoguang Wang's avatar Xiaoguang Wang Committed by Theodore Ts'o
Browse files

ext4: fix comments in ext4_can_extents_be_merged() 



Since commit a9b82415, we are allowed to merge unwritten extents,
so here these comments are wrong, remove it.

Signed-off-by: default avatarXiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 80cfb71e

fs/ext4/extents.c

+0 −6
Original line number Diff line number Diff line
@@ -1717,12 +1717,6 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1, 
{

	unsigned short ext1_ee_len, ext2_ee_len;



	/*

	 * Make sure that both extents are initialized. We don't merge

	 * unwritten extents so that we can be sure that end_io code has

	 * the extent that was written properly split out and conversion to

	 * initialized is trivial.

	 */

	if (ext4_ext_is_unwritten(ex1) != ext4_ext_is_unwritten(ex2))

		return 0;