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

Commit a3d7d674 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe
Browse files

null_blk: create a helper for req completion 



This patch creates a helper function for handling the request
completion in the null_handle_cmd().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent fceb5d1b

drivers/block/null_blk_main.c

+27 −22
Original line number Diff line number Diff line
@@ -1182,6 +1182,32 @@ static inline blk_status_t null_handle_memory_backed(struct nullb_cmd *cmd, 
	return errno_to_blk_status(err);

}



static inline void nullb_complete_cmd(struct nullb_cmd *cmd)

{

	/* Complete IO by inline, softirq or timer */

	switch (cmd->nq->dev->irqmode) {

	case NULL_IRQ_SOFTIRQ:

		switch (cmd->nq->dev->queue_mode) {

		case NULL_Q_MQ:

			blk_mq_complete_request(cmd->rq);

			break;

		case NULL_Q_BIO:

			/*

			 * XXX: no proper submitting cpu information available.

			 */

			end_cmd(cmd);

			break;

		}

		break;

	case NULL_IRQ_NONE:

		end_cmd(cmd);

		break;

	case NULL_IRQ_TIMER:

		null_cmd_end_timer(cmd);

		break;

	}

}



static blk_status_t null_handle_cmd(struct nullb_cmd *cmd, sector_t sector,

				    sector_t nr_sectors, enum req_opf op)

{
@@ -1213,28 +1239,7 @@ static blk_status_t null_handle_cmd(struct nullb_cmd *cmd, sector_t sector, 
		cmd->error = null_handle_zoned(cmd, op, sector, nr_sectors);



out:

	/* Complete IO by inline, softirq or timer */

	switch (dev->irqmode) {

	case NULL_IRQ_SOFTIRQ:

		switch (dev->queue_mode)  {

		case NULL_Q_MQ:

			blk_mq_complete_request(cmd->rq);

			break;

		case NULL_Q_BIO:

			/*

			 * XXX: no proper submitting cpu information available.

			 */

			end_cmd(cmd);

			break;

		}

		break;

	case NULL_IRQ_NONE:

		end_cmd(cmd);

		break;

	case NULL_IRQ_TIMER:

		null_cmd_end_timer(cmd);

		break;

	}

	nullb_complete_cmd(cmd);

	return BLK_STS_OK;

}