summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorEryu Guan <guaneryu@gmail.com>2016-02-21 18:38:44 -0500
committerSasha Levin <sasha.levin@oracle.com>2016-04-18 08:50:37 -0400
commit31a37d7c7ef7b4f90b600fcddd1c385a39f9d34c (patch)
tree876b0efa6cda395c772593a61c58f5ecef4308cb /fs
parent3a4db9eef86e230e3b441ea14ab4ed5492b5bf02 (diff)
ext4: iterate over buffer heads correctly in move_extent_per_page()
[ Upstream commit 87f9a031af48defee9f34c6aaf06d6f1988c244d ] In commit bcff24887d00 ("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: bcff24887d00 ("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> Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/move_extent.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 7da8ac1047f8..3fb92abe5707 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -393,6 +393,7 @@ data_copy:
*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);
if (*err < 0)
break;
+ bh = bh->b_this_page;
}
if (!*err)
*err = block_commit_write(pagep[0], from, from + replaced_size);