Commit 27a46989 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

blk-mq: Inline status checkers 



blk_mq_request_completed() and blk_mq_request_started() are
short, inline it.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7a18312c

block/blk-mq.c

+0 −12
Original line number Diff line number Diff line
@@ -663,18 +663,6 @@ bool blk_mq_complete_request(struct request *rq) 
}

EXPORT_SYMBOL(blk_mq_complete_request);



int blk_mq_request_started(struct request *rq)

{

	return blk_mq_rq_state(rq) != MQ_RQ_IDLE;

}

EXPORT_SYMBOL_GPL(blk_mq_request_started);



int blk_mq_request_completed(struct request *rq)

{

	return blk_mq_rq_state(rq) == MQ_RQ_COMPLETE;

}

EXPORT_SYMBOL_GPL(blk_mq_request_completed);



void blk_mq_start_request(struct request *rq)

{

	struct request_queue *q = rq->q;

block/blk-mq.h

+0 −9
Original line number Diff line number Diff line
@@ -128,15 +128,6 @@ extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx); 


void blk_mq_release(struct request_queue *q);



/**

 * blk_mq_rq_state() - read the current MQ_RQ_* state of a request

 * @rq: target request.

 */

static inline enum mq_rq_state blk_mq_rq_state(struct request *rq)

{

	return READ_ONCE(rq->state);

}



static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,

					   unsigned int cpu)

{

include/linux/blk-mq.h

+18 −2
Original line number Diff line number Diff line
@@ -333,9 +333,25 @@ static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag) 
	return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;

}



/**

 * blk_mq_rq_state() - read the current MQ_RQ_* state of a request

 * @rq: target request.

 */

static inline enum mq_rq_state blk_mq_rq_state(struct request *rq)

{

	return READ_ONCE(rq->state);

}



static inline int blk_mq_request_started(struct request *rq)

{

	return blk_mq_rq_state(rq) != MQ_RQ_IDLE;

}



static inline int blk_mq_request_completed(struct request *rq)

{

	return blk_mq_rq_state(rq) == MQ_RQ_COMPLETE;

}



int blk_mq_request_started(struct request *rq);

int blk_mq_request_completed(struct request *rq);

void blk_mq_start_request(struct request *rq);

void blk_mq_end_request(struct request *rq, blk_status_t error);

void __blk_mq_end_request(struct request *rq, blk_status_t error);