Sync up with encryption patches
[ext4-patch-queue.git] / fix-comments-in-ext4_can_extents_be_merged
blob93c96f82fe846d007225917b4ae84081a6e353c6
1 ext4: fix comments in ext4_can_extents_be_merged()
3 From: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
5 Since commit a9b8241594add, we are allowed to merge unwritten extents,
6 so here these comments are wrong, remove it.
8 Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
9 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
10 ---
11  fs/ext4/extents.c | 6 ------
12  1 file changed, 6 deletions(-)
14 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
15 index bed4308..2e6af88 100644
16 --- a/fs/ext4/extents.c
17 +++ b/fs/ext4/extents.c
18 @@ -1717,12 +1717,6 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,
19  {
20         unsigned short ext1_ee_len, ext2_ee_len;
22 -       /*
23 -        * Make sure that both extents are initialized. We don't merge
24 -        * unwritten extents so that we can be sure that end_io code has
25 -        * the extent that was written properly split out and conversion to
26 -        * initialized is trivial.
27 -        */
28         if (ext4_ext_is_unwritten(ex1) != ext4_ext_is_unwritten(ex2))
29                 return 0;
31 -- 
32 1.8.3.1