ext4: fix double-free of blocks due to wrong extents moved_len

[linux-2.6-microblaze.git] / fs / ext4 / move_extent.c

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 3aa5737..391efa6 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -618,6 +618,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,
                goto out;
        o_end = o_start + len;
 
+       *moved_len = 0;
        while (o_start < o_end) {
                struct ext4_extent *ex;
                ext4_lblk_t cur_blk, next_blk;
@@ -672,7 +673,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,
                 */
                ext4_double_up_write_data_sem(orig_inode, donor_inode);
                /* Swap original branches with new branches */
-               move_extent_per_page(o_filp, donor_inode,
+               *moved_len += move_extent_per_page(o_filp, donor_inode,
                                     orig_page_index, donor_page_index,
                                     offset_in_page, cur_len,
                                     unwritten, &ret);
@@ -682,9 +683,6 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,
                o_start += cur_len;
                d_start += cur_len;
        }
-       *moved_len = o_start - orig_blk;
-       if (*moved_len > len)
-               *moved_len = len;
 
 out:
        if (*moved_len) {