diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
commit | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (patch) | |
tree | 40270feadd63149bcd43380cf3fe402a2dcd85ad /fs/ext4/move_extent.c | |
parent | 9b17ba5e21b99587d7c54250059cf10fd51c74f2 (diff) | |
parent | 6fe78bc1bfcddabbf3d210e18f91da44fa796d8a (diff) |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.04
Conflicts:
arch/arm/include/asm/psci.h
mm/memcontrol.c
Diffstat (limited to 'fs/ext4/move_extent.c')
-rw-r--r-- | fs/ext4/move_extent.c | 1 |
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); |