diff options
author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-01-19 11:58:54 -0500 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-01-19 14:51:59 -0500 |
commit | c77ff7fd03ddca8face268c4cf093c0edf4bcf1f (patch) | |
tree | 333b693dfac8519730d85c03cef0ec9f60a72b17 | |
parent | 8c7a8d1c4b9c30a2be3b31a2e6af1cefd45574eb (diff) |
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: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | block/blk-core.c | 2 | ||||
-rw-r--r-- | block/blk-mq.c | 4 | ||||
-rw-r--r-- | block/blk-mq.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index c21a16e9fdf9..1645a1e54a37 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -2520,7 +2520,7 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request * | |||
2520 | * bypass a potential scheduler on the bottom device for | 2520 | * bypass a potential scheduler on the bottom device for |
2521 | * insert. | 2521 | * insert. |
2522 | */ | 2522 | */ |
2523 | return blk_mq_request_direct_issue(rq); | 2523 | return blk_mq_request_issue_directly(rq); |
2524 | } | 2524 | } |
2525 | 2525 | ||
2526 | spin_lock_irqsave(q->queue_lock, flags); | 2526 | spin_lock_irqsave(q->queue_lock, flags); |
diff --git a/block/blk-mq.c b/block/blk-mq.c index 74a4f237ba91..0fc6c95e5a29 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
@@ -1785,7 +1785,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, | |||
1785 | * RCU or SRCU read lock is needed before checking quiesced flag. | 1785 | * RCU or SRCU read lock is needed before checking quiesced flag. |
1786 | * | 1786 | * |
1787 | * When queue is stopped or quiesced, ignore 'bypass_insert' from | 1787 | * When queue is stopped or quiesced, ignore 'bypass_insert' from |
1788 | * blk_mq_request_direct_issue(), and return BLK_STS_OK to caller, | 1788 | * blk_mq_request_issue_directly(), and return BLK_STS_OK to caller, |
1789 | * and avoid driver to try to dispatch again. | 1789 | * and avoid driver to try to dispatch again. |
1790 | */ | 1790 | */ |
1791 | if (blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q)) { | 1791 | 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, | |||
1833 | hctx_unlock(hctx, srcu_idx); | 1833 | hctx_unlock(hctx, srcu_idx); |
1834 | } | 1834 | } |
1835 | 1835 | ||
1836 | blk_status_t blk_mq_request_direct_issue(struct request *rq) | 1836 | blk_status_t blk_mq_request_issue_directly(struct request *rq) |
1837 | { | 1837 | { |
1838 | blk_status_t ret; | 1838 | blk_status_t ret; |
1839 | int srcu_idx; | 1839 | int srcu_idx; |
diff --git a/block/blk-mq.h b/block/blk-mq.h index e3ebc93646ca..88c558f71819 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h | |||
@@ -75,7 +75,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, | |||
75 | struct list_head *list); | 75 | struct list_head *list); |
76 | 76 | ||
77 | /* Used by blk_insert_cloned_request() to issue request directly */ | 77 | /* Used by blk_insert_cloned_request() to issue request directly */ |
78 | blk_status_t blk_mq_request_direct_issue(struct request *rq); | 78 | blk_status_t blk_mq_request_issue_directly(struct request *rq); |
79 | 79 | ||
80 | /* | 80 | /* |
81 | * CPU -> queue mappings | 81 | * CPU -> queue mappings |