ext4: iterate over buffer heads correctly in move_extent_per_page()

In commit bcff24887d ("ext4: don't read blocks from disk after extents
being swapped") bh is not updated correctly in the for loop and wrong
data has been written to disk. generic/324 catches this on sub-page
block size ext4.

Fixes: bcff24887d ("ext4: don't read blocks from disk after extentsbeing swapped")
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Eryu Guan 2016-02-21 18:38:44 -05:00 committed by Theodore Ts'o
parent 1e9d180ba3
commit 6ffe77bad5

View file

@ -390,6 +390,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0); *err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);
if (*err < 0) if (*err < 0)
break; break;
bh = bh->b_this_page;
} }
if (!*err) if (!*err)
*err = block_commit_write(pagep[0], from, from + replaced_size); *err = block_commit_write(pagep[0], from, from + replaced_size);