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

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

blk-mq: add blk_mq_requeue_request 



This allows to requeue a request that has been accepted by ->queue_rq
earlier.  This is needed by the SCSI layer in various error conditions.

The existing internal blk_mq_requeue_request is renamed to
__blk_mq_requeue_request as it is a lower level building block for this
funtionality.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2f268556

block/blk-mq.c

+16 −2
Original line number Original line Diff line number Diff line
@@ -400,7 +400,7 @@ static void blk_mq_start_request(struct request *rq, bool last) 
		rq->cmd_flags |= REQ_END;

		rq->cmd_flags |= REQ_END;

}

}





static void blk_mq_requeue_request(struct request *rq)

static void __blk_mq_requeue_request(struct request *rq)

{

{

	struct request_queue *q = rq->q;

	struct request_queue *q = rq->q;
@@ -413,6 +413,20 @@ static void blk_mq_requeue_request(struct request *rq) 
		rq->nr_phys_segments--;

		rq->nr_phys_segments--;

}

}





void blk_mq_requeue_request(struct request *rq)

{

	struct request_queue *q = rq->q;



	__blk_mq_requeue_request(rq);

	blk_clear_rq_complete(rq);



	trace_block_rq_requeue(q, rq);



	BUG_ON(blk_queued_rq(rq));

	blk_mq_insert_request(rq, true, true, false);

}

EXPORT_SYMBOL(blk_mq_requeue_request);



struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag)

struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag)

{

{

	return tags->rqs[tag];

	return tags->rqs[tag];
@@ -602,7 +616,7 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx) 
			 * time

			 * time

			 */

			 */

			list_add(&rq->queuelist, &rq_list);

			list_add(&rq->queuelist, &rq_list);

			blk_mq_requeue_request(rq);

			__blk_mq_requeue_request(rq);

			break;

			break;

		default:

		default:

			pr_err("blk-mq: bad return on queue: %d\n", ret);

			pr_err("blk-mq: bad return on queue: %d\n", ret);

include/linux/blk-mq.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -153,6 +153,8 @@ void blk_mq_free_single_hw_queue(struct blk_mq_hw_ctx *, unsigned int); 
void blk_mq_end_io(struct request *rq, int error);

void blk_mq_end_io(struct request *rq, int error);

void __blk_mq_end_io(struct request *rq, int error);

void __blk_mq_end_io(struct request *rq, int error);





void blk_mq_requeue_request(struct request *rq);



void blk_mq_complete_request(struct request *rq);

void blk_mq_complete_request(struct request *rq);





void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx);

void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx);