diff options
| author | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
|---|---|---|
| committer | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
| commit | b7fbb07e1d6744e87079a12dc29f7c2fb8205c26 (patch) | |
| tree | e51ff461b46a470c81d62c6d86853187646624c3 /fs/bio.c | |
| parent | 4da2c19b694dd0e5932cee3eeb40df3e637628cc (diff) | |
| parent | cac65253a9c5a30d4c8d7bc4c60197935f9e2e70 (diff) | |
Merge tag 'v3.10.15' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.15-final
This is the 3.10.15 stable release
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -917,8 +917,8 @@ void bio_copy_data(struct bio *dst, struct bio *src) src_p = kmap_atomic(src_bv->bv_page); dst_p = kmap_atomic(dst_bv->bv_page); - memcpy(dst_p + dst_bv->bv_offset, - src_p + src_bv->bv_offset, + memcpy(dst_p + dst_offset, + src_p + src_offset, bytes); kunmap_atomic(dst_p); |