summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaoguang Wang <wangxg.fnst@cn.fujitsu.com>2015-04-02 16:53:11 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-04-02 16:53:11 -0400
commit4255c224b97f6d286d9d791962dec2b02c652b42 (patch)
treeec8049b46b02a93c552904a1ae2c2cecf670e40d
parent80cfb71e2e9222b86399a554a69e299877f2dc27 (diff)
downloadop-kernel-dev-4255c224b97f6d286d9d791962dec2b02c652b42.zip
op-kernel-dev-4255c224b97f6d286d9d791962dec2b02c652b42.tar.gz
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 <wangxg.fnst@cn.fujitsu.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--fs/ext4/extents.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bed4308..2e6af88 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;
OpenPOWER on IntegriCloud