block: Add bio_clone_bioset(), bio_clone_kmalloc()

[mirror_ubuntu-zesty-kernel.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index b776cc90a4e7e5260fd4ef078edb566a052b6478..82aab28158581e41632607dfd5c021acf73ce6b1 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2781,16 +2781,10 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
        blk_rq_init(NULL, rq);
 
        __rq_for_each_bio(bio_src, rq_src) {
-               bio = bio_alloc_bioset(gfp_mask, bio_src->bi_max_vecs, bs);
+               bio = bio_clone_bioset(bio_src, gfp_mask, bs);
                if (!bio)
                        goto free_and_out;
 
-               __bio_clone(bio, bio_src);
-
-               if (bio_integrity(bio_src) &&
-                   bio_integrity_clone(bio, bio_src, gfp_mask))
-                       goto free_and_out;
-
                if (bio_ctr && bio_ctr(bio, bio_src, data))
                        goto free_and_out;