bio_copy_user_iov(): don't ignore ->iov_offset

[mirror_ubuntu-artful-kernel.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index a49d8e77d7507ec48d22bf2fcf60ac04cd21b7a3..30f56b8b1fb26c362605f89155a5e9db4b21feb5 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -1235,8 +1235,8 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
         */
        bmd->is_our_pages = map_data ? 0 : 1;
        memcpy(bmd->iov, iter->iov, sizeof(struct iovec) * iter->nr_segs);
-       iov_iter_init(&bmd->iter, iter->type, bmd->iov,
-                       iter->nr_segs, iter->count);
+       bmd->iter = *iter;
+       bmd->iter.iov = bmd->iov;
 
        ret = -ENOMEM;
        bio = bio_kmalloc(gfp_mask, nr_pages);