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

Commit c77ff7fd authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq: Rename blk_mq_request_direct_issue() into blk_mq_request_issue_directly() 



Most blk-mq functions have a name that follows the pattern blk_mq_${action}.
However, the function name blk_mq_request_direct_issue is an exception.
Hence rename this function. This patch does not change any functionality.

Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8c7a8d1c

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2520,7 +2520,7 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request * 
		 * bypass a potential scheduler on the bottom device for

		 * insert.

		 */

		return blk_mq_request_direct_issue(rq);

		return blk_mq_request_issue_directly(rq);

	}



	spin_lock_irqsave(q->queue_lock, flags);

block/blk-mq.c

+2 −2
Original line number Diff line number Diff line
@@ -1785,7 +1785,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, 
	 * RCU or SRCU read lock is needed before checking quiesced flag.

	 *

	 * When queue is stopped or quiesced, ignore 'bypass_insert' from

	 * blk_mq_request_direct_issue(), and return BLK_STS_OK to caller,

	 * blk_mq_request_issue_directly(), and return BLK_STS_OK to caller,

	 * and avoid driver to try to dispatch again.

	 */

	if (blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q)) {
@@ -1833,7 +1833,7 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, 
	hctx_unlock(hctx, srcu_idx);

}



blk_status_t blk_mq_request_direct_issue(struct request *rq)

blk_status_t blk_mq_request_issue_directly(struct request *rq)

{

	blk_status_t ret;

	int srcu_idx;

block/blk-mq.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, 
				struct list_head *list);



/* Used by blk_insert_cloned_request() to issue request directly */

blk_status_t blk_mq_request_direct_issue(struct request *rq);

blk_status_t blk_mq_request_issue_directly(struct request *rq);



/*

 * CPU -> queue mappings