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

bfq: simplify bfq_bic_lookup 



Remove the unused bfqd argument, and hardcode ioc to current->io_context.

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


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

block/bfq-iosched.c

+10 −15
Original line number Diff line number Diff line
@@ -433,28 +433,23 @@ static struct bfq_io_cq *icq_to_bic(struct io_cq *icq) 


/**

 * bfq_bic_lookup - search into @ioc a bic associated to @bfqd.

 * @bfqd: the lookup key.

 * @ioc: the io_context of the process doing I/O.

 * @q: the request queue.

 */

static struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd,

					struct io_context *ioc,

					struct request_queue *q)

static struct bfq_io_cq *bfq_bic_lookup(struct request_queue *q)

{

	if (ioc) {

		unsigned long flags;

	struct bfq_io_cq *icq;

	unsigned long flags;



	if (!current->io_context)

		return NULL;



	spin_lock_irqsave(&q->queue_lock, flags);

		icq = icq_to_bic(ioc_lookup_icq(ioc, q));

	icq = icq_to_bic(ioc_lookup_icq(current->io_context, q));

	spin_unlock_irqrestore(&q->queue_lock, flags);



	return icq;

}



	return NULL;

}



/*

 * Scheduler run of queue, if there are requests pending and no one in the

 * driver that will restart queueing.
@@ -2457,7 +2452,7 @@ static bool bfq_bio_merge(struct request_queue *q, struct bio *bio, 
	 * returned by bfq_bic_lookup does not go away before

	 * bfqd->lock is taken.

	 */

	struct bfq_io_cq *bic = bfq_bic_lookup(bfqd, current->io_context, q);

	struct bfq_io_cq *bic = bfq_bic_lookup(q);

	bool ret;



	spin_lock_irq(&bfqd->lock);