| Message ID | 1423048305-11335-1-git-send-email-wangxg.fnst@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wed, Feb 04, 2015 at 07:11:45PM +0800, Xiaoguang Wang wrote: > Since commit 66369e0, 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> Thanks, applied. BTW, the commit ID was wrong; I've corrected it to be a9b8241594add. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
Since commit 66369e0, 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> --- fs/ext4/extents.c | 6 ------ 1 file changed, 6 deletions(-)