Commit a0e8de79 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: initialize the target bio in __bio_clone_fast 



All callers of __bio_clone_fast initialize the bio first.  Move that
initialization into __bio_clone_fast instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Link: https://lore.kernel.org/r/20220202160109.108149-13-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 92986f6b

block/bio.c

+40 −35
Original line number Diff line number Diff line
@@ -728,37 +728,16 @@ void bio_put(struct bio *bio) 
}

EXPORT_SYMBOL(bio_put);



/**

 * 	__bio_clone_fast - clone a bio that shares the original bio's biovec

 * 	@bio: destination bio

 * 	@bio_src: bio to clone

 *	@gfp: allocation flags

 *

 *	Clone a &bio. Caller will own the returned bio, but not

 *	the actual data it points to. Reference count of returned

 * 	bio will be one.

 *

 * 	Caller must ensure that @bio_src is not freed before @bio.

 */

int __bio_clone_fast(struct bio *bio, struct bio *bio_src, gfp_t gfp)

static int __bio_clone(struct bio *bio, struct bio *bio_src, gfp_t gfp)

{

	WARN_ON_ONCE(bio->bi_pool && bio->bi_max_vecs);



	/*

	 * most users will be overriding ->bi_bdev with a new target,

	 * so we don't set nor calculate new physical/hw segment counts here

	 */

	bio->bi_bdev = bio_src->bi_bdev;

	bio_set_flag(bio, BIO_CLONED);

	if (bio_flagged(bio_src, BIO_THROTTLED))

		bio_set_flag(bio, BIO_THROTTLED);

	if (bio_flagged(bio_src, BIO_REMAPPED))

		bio_set_flag(bio, BIO_REMAPPED);

	bio->bi_opf = bio_src->bi_opf;

	bio->bi_ioprio = bio_src->bi_ioprio;

	bio->bi_write_hint = bio_src->bi_write_hint;

	bio->bi_iter = bio_src->bi_iter;

	bio->bi_io_vec = bio_src->bi_io_vec;



	bio_clone_blkg_association(bio, bio_src);

	blkcg_bio_issue_init(bio);
@@ -770,33 +749,59 @@ int __bio_clone_fast(struct bio *bio, struct bio *bio_src, gfp_t gfp) 
		return -ENOMEM;

	return 0;

}

EXPORT_SYMBOL(__bio_clone_fast);



/**

 * bio_clone_fast - clone a bio that shares the original bio's biovec

 *	@bio: bio to clone

 *	@gfp_mask: allocation priority

 * @bio_src: bio to clone from

 * @gfp: allocation priority

 * @bs: bio_set to allocate from

 *

 * 	Like __bio_clone_fast, only also allocates the returned bio

 * Allocate a new bio that is a clone of @bio_src. The caller owns the returned

 * bio, but not the actual data it points to.

 *

 * The caller must ensure that the return bio is not freed before @bio_src.

 */

struct bio *bio_clone_fast(struct bio *bio, gfp_t gfp_mask, struct bio_set *bs)

struct bio *bio_clone_fast(struct bio *bio_src, gfp_t gfp, struct bio_set *bs)

{

	struct bio *b;

	struct bio *bio;



	b = bio_alloc_bioset(NULL, 0, 0, gfp_mask, bs);

	if (!b)

	bio = bio_alloc_bioset(bio_src->bi_bdev, 0, bio_src->bi_opf, gfp, bs);

	if (!bio)

		return NULL;



	if (__bio_clone_fast(b, bio, gfp_mask < 0)) {

		bio_put(b);

	if (__bio_clone(bio, bio_src, gfp) < 0) {

		bio_put(bio);

		return NULL;

	}

	bio->bi_io_vec = bio_src->bi_io_vec;



	return b;

	return bio;

}

EXPORT_SYMBOL(bio_clone_fast);



/**

 * __bio_clone_fast - clone a bio that shares the original bio's biovec

 * @bio: bio to clone into

 * @bio_src: bio to clone from

 * @gfp: allocation priority

 *

 * Initialize a new bio in caller provided memory that is a clone of @bio_src.

 * The caller owns the returned bio, but not the actual data it points to.

 *

 * The caller must ensure that @bio_src is not freed before @bio.

 */

int __bio_clone_fast(struct bio *bio, struct bio *bio_src, gfp_t gfp)

{

	int ret;



	bio_init(bio, bio_src->bi_bdev, bio_src->bi_io_vec, 0, bio_src->bi_opf);

	ret = __bio_clone(bio, bio_src, gfp);

	if (ret)

		bio_uninit(bio);

	return ret;

}

EXPORT_SYMBOL(__bio_clone_fast);



const char *bio_devname(struct bio *bio, char *buf)

{

	return bdevname(bio->bi_bdev, buf);

drivers/md/bcache/request.c

+0 −1
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ static void do_bio_hook(struct search *s, 
{

	struct bio *bio = &s->bio.bio;



	bio_init(bio, NULL, NULL, 0, 0);

	__bio_clone_fast(bio, orig_bio, GFP_NOIO);

	/*

	 * bi_end_io can be set separately somewhere else, e.g. the

drivers/md/md-multipath.c

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ static bool multipath_make_request(struct mddev *mddev, struct bio * bio) 
	}

	multipath = conf->multipaths + mp_bh->path;



	bio_init(&mp_bh->bio, NULL, NULL, 0, 0);

	__bio_clone_fast(&mp_bh->bio, bio, GFP_NOIO);



	mp_bh->bio.bi_iter.bi_sector += multipath->rdev->data_offset;