Commit e2b3fa5a authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

block: Remove bio->bi_ioc 



bio->bi_ioc is never set so always NULL. Remove references to it in
bio_disassociate_task() and in rq_ioc() and delete this field from
struct bio. With this change, rq_ioc() always returns
current->io_context without the need for a bio argument. Further
simplify the code and make it more readable by also removing this
helper, which also allows to simplify blk_mq_sched_assign_ioc() by
removing its bio argument.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarAdam Manzanares <adam.manzanares@wdc.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 23464f8c

block/bio.c

+0 −4
Original line number Diff line number Diff line
@@ -2027,10 +2027,6 @@ int bio_associate_blkg(struct bio *bio, struct blkcg_gq *blkg) 
 */

void bio_disassociate_task(struct bio *bio)

{

	if (bio->bi_ioc) {

		put_io_context(bio->bi_ioc);

		bio->bi_ioc = NULL;

	}

	if (bio->bi_css) {

		css_put(bio->bi_css);

		bio->bi_css = NULL;

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ out: 


void blk_init_request_from_bio(struct request *req, struct bio *bio)

{

	struct io_context *ioc = rq_ioc(bio);

	struct io_context *ioc = current->io_context;



	if (bio->bi_opf & REQ_RAHEAD)

		req->cmd_flags |= REQ_FAILFAST_MASK;

block/blk-mq-sched.c

+2 −2
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ void blk_mq_sched_free_hctx_data(struct request_queue *q, 
}

EXPORT_SYMBOL_GPL(blk_mq_sched_free_hctx_data);



void blk_mq_sched_assign_ioc(struct request *rq, struct bio *bio)

void blk_mq_sched_assign_ioc(struct request *rq)

{

	struct request_queue *q = rq->q;

	struct io_context *ioc = rq_ioc(bio);

	struct io_context *ioc = current->io_context;

	struct io_cq *icq;



	spin_lock_irq(&q->queue_lock);

block/blk-mq-sched.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
void blk_mq_sched_free_hctx_data(struct request_queue *q,

				 void (*exit)(struct blk_mq_hw_ctx *));



void blk_mq_sched_assign_ioc(struct request *rq, struct bio *bio);

void blk_mq_sched_assign_ioc(struct request *rq);



void blk_mq_sched_request_inserted(struct request *rq);

bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,

block/blk-mq.c

+2 −2
Original line number Diff line number Diff line
@@ -389,8 +389,8 @@ static struct request *blk_mq_get_request(struct request_queue *q, 
	if (!op_is_flush(data->cmd_flags)) {

		rq->elv.icq = NULL;

		if (e && e->type->ops.prepare_request) {

			if (e->type->icq_cache && rq_ioc(bio))

				blk_mq_sched_assign_ioc(rq, bio);

			if (e->type->icq_cache)

				blk_mq_sched_assign_ioc(rq);



			e->type->ops.prepare_request(rq, bio);

			rq->rq_flags |= RQF_ELVPRIV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE