Message ID | 1529500964-28429-4-git-send-email-jianchao.w.wang@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 7948049..d756539 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -1428,7 +1428,7 @@ static void null_request_fn(struct request_queue *q) static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res) { pr_info("null: rq %p timed out\n", rq); - blk_mq_complete_request(rq); + __blk_mq_complete_request(rq); return BLK_EH_DONE; }
To regain the capability to prevent normal completion path from entering a timeout request, blk_mq_mark_rq_complete is introduced in blk_mq_complete_request. Have to use __blk_mq_complete_request in timeout path to complete a timeout request. Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com> --- drivers/block/null_blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)