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

Commit af67c31f authored by NeilBrown's avatar NeilBrown Committed by Jens Axboe
Browse files

blk: remove bio_set arg from blk_queue_split() 



blk_queue_split() is always called with the last arg being q->bio_split,
where 'q' is the first arg.

Also blk_queue_split() sometimes uses the passed-in 'bs' and sometimes uses
q->bio_split.

This is inconsistent and unnecessary.  Remove the last arg and always use
q->bio_split inside blk_queue_split()

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Credit-to: Javier González <jg@lightnvm.io> (Noticed that lightnvm was missed)
Reviewed-by: default avatarJavier González <javier@cnexlabs.com>
Tested-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e4cdf1a1

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) 
	 */

	blk_queue_bounce(q, &bio);



	blk_queue_split(q, &bio, q->bio_split);

	blk_queue_split(q, &bio);



	if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {

		bio->bi_status = BLK_STS_IOERR;

block/blk-merge.c

+4 −5
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, 
	return do_split ? new : NULL;

}



void blk_queue_split(struct request_queue *q, struct bio **bio,

		     struct bio_set *bs)

void blk_queue_split(struct request_queue *q, struct bio **bio)

{

	struct bio *split, *res;

	unsigned nsegs;
@@ -211,13 +210,13 @@ void blk_queue_split(struct request_queue *q, struct bio **bio, 
	switch (bio_op(*bio)) {

	case REQ_OP_DISCARD:

	case REQ_OP_SECURE_ERASE:

		split = blk_bio_discard_split(q, *bio, bs, &nsegs);

		split = blk_bio_discard_split(q, *bio, q->bio_split, &nsegs);

		break;

	case REQ_OP_WRITE_ZEROES:

		split = blk_bio_write_zeroes_split(q, *bio, bs, &nsegs);

		split = blk_bio_write_zeroes_split(q, *bio, q->bio_split, &nsegs);

		break;

	case REQ_OP_WRITE_SAME:

		split = blk_bio_write_same_split(q, *bio, bs, &nsegs);

		split = blk_bio_write_same_split(q, *bio, q->bio_split, &nsegs);

		break;

	default:

		split = blk_bio_segment_split(q, *bio, q->bio_split, &nsegs);

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 


	blk_queue_bounce(q, &bio);



	blk_queue_split(q, &bio, q->bio_split);

	blk_queue_split(q, &bio);



	if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {

		bio_io_error(bio);

drivers/block/drbd/drbd_req.c

+1 −1
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio) 
	struct drbd_device *device = (struct drbd_device *) q->queuedata;

	unsigned long start_jif;



	blk_queue_split(q, &bio, q->bio_split);

	blk_queue_split(q, &bio);



	start_jif = jiffies;

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -2414,7 +2414,7 @@ static blk_qc_t pkt_make_request(struct request_queue *q, struct bio *bio) 


	blk_queue_bounce(q, &bio);



	blk_queue_split(q, &bio, q->bio_split);

	blk_queue_split(q, &bio);



	pd = q->queuedata;

	if (!pd) {