Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf800ef1 authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: Add bio_clone_bioset(), bio_clone_kmalloc() 



Previously, there was bio_clone() but it only allocated from the fs bio
set; as a result various users were open coding it and using
__bio_clone().

This changes bio_clone() to become bio_clone_bioset(), and then we add
bio_clone() and bio_clone_kmalloc() as wrappers around it, making use of
the functionality the last patch adedd.

This will also help in a later patch changing how bio cloning works.

Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: NeilBrown <neilb@suse.de>
CC: Alasdair Kergon <agk@redhat.com>
CC: Boaz Harrosh <bharrosh@panasas.com>
CC: Jeff Garzik <jeff@garzik.org>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3f86a82a

block/blk-core.c

+1 −7
Original line number Diff line number Diff line
@@ -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;

drivers/block/osdblk.c

+1 −2
Original line number Diff line number Diff line
@@ -266,11 +266,10 @@ static struct bio *bio_chain_clone(struct bio *old_chain, gfp_t gfpmask) 
	struct bio *tmp, *new_chain = NULL, *tail = NULL;



	while (old_chain) {

		tmp = bio_kmalloc(gfpmask, old_chain->bi_max_vecs);

		tmp = bio_clone_kmalloc(old_chain, gfpmask);

		if (!tmp)

			goto err_out;



		__bio_clone(tmp, old_chain);

		tmp->bi_bdev = NULL;

		gfpmask &= ~__GFP_WAIT;

		tmp->bi_next = NULL;

drivers/md/dm-crypt.c

+1 −6
Original line number Diff line number Diff line
@@ -979,19 +979,14 @@ static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp) 
	 * copy the required bvecs because we need the original

	 * one in order to decrypt the whole bio data *afterwards*.

	 */

	clone = bio_alloc_bioset(gfp, bio_segments(base_bio), cc->bs);

	clone = bio_clone_bioset(base_bio, gfp, cc->bs);

	if (!clone)

		return 1;



	crypt_inc_pending(io);



	clone_init(io, clone);

	clone->bi_idx = 0;

	clone->bi_vcnt = bio_segments(base_bio);

	clone->bi_size = base_bio->bi_size;

	clone->bi_sector = cc->start + io->sector;

	memcpy(clone->bi_io_vec, bio_iovec(base_bio),

	       sizeof(struct bio_vec) * clone->bi_vcnt);



	generic_make_request(clone);

	return 0;

drivers/md/dm.c

+2 −2
Original line number Diff line number Diff line
@@ -1129,8 +1129,8 @@ static void __issue_target_request(struct clone_info *ci, struct dm_target *ti, 
	 * ci->bio->bi_max_vecs is BIO_INLINE_VECS anyway, for both flush

	 * and discard, so no need for concern about wasted bvec allocations.

	 */

	clone = bio_alloc_bioset(GFP_NOIO, ci->bio->bi_max_vecs, ci->md->bs);

	__bio_clone(clone, ci->bio);

	clone = bio_clone_bioset(ci->bio, GFP_NOIO, ci->md->bs);



	if (len) {

		clone->bi_sector = ci->sector;

		clone->bi_size = to_bytes(len);

drivers/md/md.c

+1 −19
Original line number Diff line number Diff line
@@ -173,28 +173,10 @@ EXPORT_SYMBOL_GPL(bio_alloc_mddev); 
struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask,

			    struct mddev *mddev)

{

	struct bio *b;



	if (!mddev || !mddev->bio_set)

		return bio_clone(bio, gfp_mask);



	b = bio_alloc_bioset(gfp_mask, bio->bi_max_vecs, mddev->bio_set);

	if (!b)

		return NULL;



	__bio_clone(b, bio);

	if (bio_integrity(bio)) {

		int ret;



		ret = bio_integrity_clone(b, bio, gfp_mask);



		if (ret < 0) {

			bio_put(b);

			return NULL;

		}

	}



	return b;

	return bio_clone_bioset(bio, gfp_mask, mddev->bio_set);

}

EXPORT_SYMBOL_GPL(bio_clone_mddev);