Commit a87ccce0 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

blk-mq: remove blk_mq_complete_request_sync 



blk_mq_tagset_wait_completed_request() has been applied for waiting
for completed request's fn, so not necessary to use
blk_mq_complete_request_sync() any more.

Cc: Max Gurtovoy <maxg@mellanox.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 622b8b68

block/blk-mq.c

+0 −7
Original line number Diff line number Diff line
@@ -652,13 +652,6 @@ bool blk_mq_complete_request(struct request *rq) 
}

EXPORT_SYMBOL(blk_mq_complete_request);



void blk_mq_complete_request_sync(struct request *rq)

{

	WRITE_ONCE(rq->state, MQ_RQ_COMPLETE);

	rq->q->mq_ops->complete(rq);

}

EXPORT_SYMBOL_GPL(blk_mq_complete_request_sync);



int blk_mq_request_started(struct request *rq)

{

	return blk_mq_rq_state(rq) != MQ_RQ_IDLE;

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) 
		return true;



	nvme_req(req)->status = NVME_SC_ABORT_REQ;

	blk_mq_complete_request_sync(req);

	blk_mq_complete_request(req);

	return true;

}

EXPORT_SYMBOL_GPL(nvme_cancel_request);

include/linux/blk-mq.h

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list); 
void blk_mq_kick_requeue_list(struct request_queue *q);

void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);

bool blk_mq_complete_request(struct request *rq);

void blk_mq_complete_request_sync(struct request *rq);

bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,

			   struct bio *bio, unsigned int nr_segs);

bool blk_mq_queue_stopped(struct request_queue *q);

CRA Git | Maintained and supported by SUSTech CRA and CCSE