redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

blk-mq: replace and kill blk_mq_request_issue_directly 

Replace blk_mq_request_issue_directly with blk_mq_try_issue_directly
in blk_insert_cloned_request and kill it as nobody uses it any more.

Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
hifive-unleashed-5.1
Jianchao Wang 2018-12-14 09:28:20 +08:00 committed by Jens Axboe
parent 5b7a6f128a
commit d6a51a97c0
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-core.c
View File

@ -1240,6 +1240,8 @@ static int blk_cloned_rq_check_limits(struct request_queue *q,
*/ */
blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *rq) blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *rq)
{ {
blk_qc_t unused;
if (blk_cloned_rq_check_limits(q, rq)) if (blk_cloned_rq_check_limits(q, rq))
return BLK_STS_IOERR; return BLK_STS_IOERR;
@ -1255,7 +1257,7 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *
* bypass a potential scheduler on the bottom device for * bypass a potential scheduler on the bottom device for
* insert. * insert.
*/ */
return blk_mq_request_issue_directly(rq, true); return blk_mq_try_issue_directly(rq->mq_hctx, rq, &unused, true, true);
} }
EXPORT_SYMBOL_GPL(blk_insert_cloned_request); EXPORT_SYMBOL_GPL(blk_insert_cloned_request);

9
block/blk-mq.c
View File

@ -1792,7 +1792,7 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
return ret; return ret;
} }
static blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
struct request *rq, struct request *rq,
blk_qc_t *cookie, blk_qc_t *cookie,
bool bypass, bool last) bool bypass, bool last)
@ -1864,13 +1864,6 @@ out_unlock:
return ret; return ret;
} }
blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last)
{
blk_qc_t unused;
return blk_mq_try_issue_directly(rq->mq_hctx, rq, &unused, true, last);
}
void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx, void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
struct list_head *list) struct list_head *list)
{ {

6
block/blk-mq.h
View File

@ -68,8 +68,10 @@ void blk_mq_request_bypass_insert(struct request *rq, bool run_queue);
void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,
struct list_head *list); struct list_head *list);
/* Used by blk_insert_cloned_request() to issue request directly */ blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last); struct request *rq,
blk_qc_t *cookie,
bool bypass, bool last);
void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx, void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
struct list_head *list); struct list_head *list);