提交 218d0f67 编写于 作者: J Jens Axboe 提交者: Xie XiuQi

skd: fixup usage of legacy IO API

mainline inclusion
from mainline-4.20-rc1
commit 6d1f9dfde7343c4ebfb8f84dcb333af571bb3b22
category: bugfix
bugzilla: 5851
CVE: NA
---------------------------

We need to be using the mq variant of request requeue here.

Fixes: ca33dd92 ("skd: Convert to blk-mq")
Signed-off-by: NJens Axboe <axboe@kernel.dk>
Signed-off-by: NYufen Yu <yuyufen@huawei.com>
Reviewed-by: NHou Tao <houtao1@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 330a06a7
...@@ -1416,7 +1416,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev, ...@@ -1416,7 +1416,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,
case SKD_CHECK_STATUS_BUSY_IMMINENT: case SKD_CHECK_STATUS_BUSY_IMMINENT:
skd_log_skreq(skdev, skreq, "retry(busy)"); skd_log_skreq(skdev, skreq, "retry(busy)");
blk_requeue_request(skdev->queue, req); blk_mq_requeue_request(req, true);
dev_info(&skdev->pdev->dev, "drive BUSY imminent\n"); dev_info(&skdev->pdev->dev, "drive BUSY imminent\n");
skdev->state = SKD_DRVR_STATE_BUSY_IMMINENT; skdev->state = SKD_DRVR_STATE_BUSY_IMMINENT;
skdev->timer_countdown = SKD_TIMER_MINUTES(20); skdev->timer_countdown = SKD_TIMER_MINUTES(20);
...@@ -1426,7 +1426,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev, ...@@ -1426,7 +1426,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,
case SKD_CHECK_STATUS_REQUEUE_REQUEST: case SKD_CHECK_STATUS_REQUEUE_REQUEST:
if ((unsigned long) ++req->special < SKD_MAX_RETRIES) { if ((unsigned long) ++req->special < SKD_MAX_RETRIES) {
skd_log_skreq(skdev, skreq, "retry"); skd_log_skreq(skdev, skreq, "retry");
blk_requeue_request(skdev->queue, req); blk_mq_requeue_request(req, true);
break; break;
} }
/* fall through */ /* fall through */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册