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

Revert "block: Provide blk_mq_sched_get_icq()" 



This reverts commit 4896c4e64ba5d5d5acdbcf68c5910dd4f6d8fa62.

The helper is not needed any more.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211126115817.2087431-6-hch@lst.de


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

block/blk-mq-sched.c

+11 −15
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
#include "blk-mq-tag.h"

#include "blk-wbt.h"



struct io_cq *blk_mq_sched_get_icq(struct request_queue *q)

void blk_mq_sched_assign_ioc(struct request *rq)

{

	struct request_queue *q = rq->q;

	struct io_context *ioc;

	struct io_cq *icq;
@@ -27,27 +28,22 @@ struct io_cq *blk_mq_sched_get_icq(struct request_queue *q) 
	if (unlikely(!current->io_context))

		create_task_io_context(current, GFP_ATOMIC, q->node);



	/* May not have an IO context if context creation failed */

	/*

	 * May not have an IO context if it's a passthrough request

	 */

	ioc = current->io_context;

	if (!ioc)

		return NULL;

		return;



	spin_lock_irq(&q->queue_lock);

	icq = ioc_lookup_icq(ioc, q);

	spin_unlock_irq(&q->queue_lock);

	if (icq)

		return icq;

	return ioc_create_icq(ioc, q, GFP_ATOMIC);

}

EXPORT_SYMBOL(blk_mq_sched_get_icq);



void blk_mq_sched_assign_ioc(struct request *rq)

{

	struct io_cq *icq;



	icq = blk_mq_sched_get_icq(rq->q);

	if (!icq) {

		icq = ioc_create_icq(ioc, q, GFP_ATOMIC);

		if (!icq)

			return;

	}

	get_io_context(icq->ioc);

	rq->elv.icq = icq;

}

block/blk-mq-sched.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#define MAX_SCHED_RQ (16 * BLKDEV_DEFAULT_RQ)



struct io_cq *blk_mq_sched_get_icq(struct request_queue *q);

void blk_mq_sched_assign_ioc(struct request *rq);



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