ext4: fix comments in ext4_can_extents_be_merged()
authorXiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
Thu, 2 Apr 2015 20:53:11 +0000 (16:53 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 2 Apr 2015 20:53:11 +0000 (16:53 -0400)
Since commit a9b8241594add, we are allowed to merge unwritten extents,
so here these comments are wrong, remove it.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/extents.c

index bed43081720f718fc30dca204be8509ddcf5eac5..2e6af88d112f3046920aba303ce2d8d35ff42452 100644 (file)
@@ -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;