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

block: null_blk: cleanup null_queue_rq() 



Use a local struct request pointer variable to avoid having to
dereference struct blk_mq_queue_data multiple times. While at it, also
fix the function argument indentation and remove a useless "else" after
a return.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarPankaj Raghav <p.raghav@samsung.com>
Link: https://lore.kernel.org/r/20230314041106.19173-2-damien.lemoal@opensource.wdc.com


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

drivers/block/null_blk/main.c

+14 −15
Original line number Diff line number Diff line
@@ -1659,10 +1659,11 @@ static enum blk_eh_timer_return null_timeout_rq(struct request *rq) 
static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,

				  const struct blk_mq_queue_data *bd)

{

	struct nullb_cmd *cmd = blk_mq_rq_to_pdu(bd->rq);

	struct request *rq = bd->rq;

	struct nullb_cmd *cmd = blk_mq_rq_to_pdu(rq);

	struct nullb_queue *nq = hctx->driver_data;

	sector_t nr_sectors = blk_rq_sectors(bd->rq);

	sector_t sector = blk_rq_pos(bd->rq);

	sector_t nr_sectors = blk_rq_sectors(rq);

	sector_t sector = blk_rq_pos(rq);

	const bool is_poll = hctx->type == HCTX_TYPE_POLL;



	might_sleep_if(hctx->flags & BLK_MQ_F_BLOCKING);
@@ -1671,15 +1672,15 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx, 
		hrtimer_init(&cmd->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

		cmd->timer.function = null_cmd_timer_expired;

	}

	cmd->rq = bd->rq;

	cmd->rq = rq;

	cmd->error = BLK_STS_OK;

	cmd->nq = nq;

	cmd->fake_timeout = should_timeout_request(bd->rq) ||

		blk_should_fake_timeout(bd->rq->q);

	cmd->fake_timeout = should_timeout_request(rq) ||

		blk_should_fake_timeout(rq->q);



	blk_mq_start_request(bd->rq);

	blk_mq_start_request(rq);



	if (should_requeue_request(bd->rq)) {

	if (should_requeue_request(rq)) {

		/*

		 * Alternate between hitting the core BUSY path, and the

		 * driver driven requeue path
@@ -1687,22 +1688,20 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx, 
		nq->requeue_selection++;

		if (nq->requeue_selection & 1)

			return BLK_STS_RESOURCE;

		else {

			blk_mq_requeue_request(bd->rq, true);

		blk_mq_requeue_request(rq, true);

		return BLK_STS_OK;

	}

	}



	if (is_poll) {

		spin_lock(&nq->poll_lock);

		list_add_tail(&bd->rq->queuelist, &nq->poll_list);

		list_add_tail(&rq->queuelist, &nq->poll_list);

		spin_unlock(&nq->poll_lock);

		return BLK_STS_OK;

	}

	if (cmd->fake_timeout)

		return BLK_STS_OK;



	return null_handle_cmd(cmd, sector, nr_sectors, req_op(bd->rq));

	return null_handle_cmd(cmd, sector, nr_sectors, req_op(rq));

}



static void cleanup_queue(struct nullb_queue *nq)