summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-10-11 14:56:14 -0600
committerJens Axboe <axboe@kernel.dk>2018-10-14 12:48:29 -0600
commit6d1f9dfde7343c4ebfb8f84dcb333af571bb3b22 (patch)
treedd72de9da4d72406b98fd412229c3ae727982d27 /drivers/block
parent3582dd291788e9441c3ba9047e55089edb98da5c (diff)
downloadlinux-rpi-6d1f9dfde7343c4ebfb8f84dcb333af571bb3b22.tar.gz
linux-rpi-6d1f9dfde7343c4ebfb8f84dcb333af571bb3b22.tar.bz2
linux-rpi-6d1f9dfde7343c4ebfb8f84dcb333af571bb3b22.zip
skd: fixup usage of legacy IO API
We need to be using the mq variant of request requeue here. Fixes: ca33dd92968b ("skd: Convert to blk-mq") Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/skd_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index a85c9a622c41..80a5806ede03 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -1416,7 +1416,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,
case SKD_CHECK_STATUS_BUSY_IMMINENT:
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");
skdev->state = SKD_DRVR_STATE_BUSY_IMMINENT;
skdev->timer_countdown = SKD_TIMER_MINUTES(20);
@@ -1426,7 +1426,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,
case SKD_CHECK_STATUS_REQUEUE_REQUEST:
if ((unsigned long) ++req->special < SKD_MAX_RETRIES) {
skd_log_skreq(skdev, skreq, "retry");
- blk_requeue_request(skdev->queue, req);
+ blk_mq_requeue_request(req, true);
break;
}
/* fall through */