blk-mq: Add a kick_requeue_list argument to blk_mq_requeue_request()

[mirror_ubuntu-artful-kernel.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 88ef6d4729b46594b8542fa81467a45763f2f343..c000fdf048b224ff47d1067a71d0962264088be0 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -909,7 +909,6 @@ out_busy:
 
 static struct blk_mq_ops blkfront_mq_ops = {
        .queue_rq = blkif_queue_rq,
-       .map_queue = blk_mq_map_queue,
 };
 
 static void blkif_set_queue_limits(struct blkfront_info *info)
@@ -2044,8 +2043,9 @@ static int blkif_recover(struct blkfront_info *info)
                /* Requeue pending requests (flush or discard) */
                list_del_init(&req->queuelist);
                BUG_ON(req->nr_phys_segments > segs);
-               blk_mq_requeue_request(req);
+               blk_mq_requeue_request(req, false);
        }
+       blk_mq_start_stopped_hw_queues(info->rq, true);
        blk_mq_kick_requeue_list(info->rq);
 
        while ((bio = bio_list_pop(&info->bio_list)) != NULL) {