aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorEryu Guan <guaneryu@gmail.com>2016-02-21 18:38:44 -0500
committerMister Oyster <oysterized@gmail.com>2017-12-31 02:14:11 +0100
commit438e5e08b147d569e739f28201ba2947ba229485 (patch)
tree1f523733b3f659a60c4a6d5ffc26c791532aa605 /fs
parent4db756ba8da17cdda9a794b8a22bf569514390c7 (diff)
ext4: iterate over buffer heads correctly in move_extent_per_page()
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: Joe Maples <joe@frap129.org>
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 fa00a0e3f..61e0942c8 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -396,6 +396,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);