| From | Luis Henriques <> | Subject | [PATCH 3.16.y-ckt 130/142] ext4: iterate over buffer heads correctly in move_extent_per_page() | Date | Tue, 22 Mar 2016 10:40:59 +0000 |
| |
3.16.7-ckt26 -stable review patch. If anyone has any objections, please let me know.
---8<------------------------------------------------------------
From: Eryu Guan <guaneryu@gmail.com>
commit 6ffe77bad545f4a7c8edd2a4ee797ccfcd894ab4 upstream.
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> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- fs/ext4/move_extent.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 146f8cd627b2..2423b0068183 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -1037,6 +1037,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);
|