summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-09 19:33:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-09 19:33:05 -0800
commit718e47a573a43dba9a1673e0fc29fb36d3ef9769 (patch)
treeeb6f8d7a07c5ddb6691c6791cf1c780cb0d58fe4
parenta6e434e9550807164c5ab7bffde59e9e7a4e717b (diff)
parent6ffe77bad545f4a7c8edd2a4ee797ccfcd894ab4 (diff)
downloadlinux-sh-718e47a573a43dba9a1673e0fc29fb36d3ef9769.tar.gz
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 fix from Ted Ts'o: "This fixes a regression which crept in v4.5-rc5" * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: iterate over buffer heads correctly in move_extent_per_page()
-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 e032a0423e35..4098acc701c3 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -390,6 +390,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);