From: Xiaoguang Wang Date: Thu, 2 Apr 2015 20:53:11 +0000 (-0400) Subject: ext4: fix comments in ext4_can_extents_be_merged() X-Git-Tag: v4.1-rc1~76^2~28 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4255c224b97f6d286d9d791962dec2b02c652b42;p=karo-tx-linux.git ext4: fix comments in ext4_can_extents_be_merged() Since commit a9b8241594add, we are allowed to merge unwritten extents, so here these comments are wrong, remove it. Signed-off-by: Xiaoguang Wang Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index bed43081720f..2e6af88d112f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -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;