These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / block / blk-exec.c

diff --git a/kernel/block/blk-exec.c b/kernel/block/blk-exec.c
index 9924725..3fec8a2 100644 (file)
--- a/kernel/block/blk-exec.c
+++ b/kernel/block/blk-exec.c
@@ -53,7 +53,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
                           rq_end_io_fn *done)
 {
        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
-       bool is_pm_resume;
 
        WARN_ON(irqs_disabled());
        WARN_ON(rq->cmd_type == REQ_TYPE_FS);
@@ -70,12 +69,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
                return;
        }
 
-       /*
-        * need to check this before __blk_run_queue(), because rq can
-        * be freed before that returns.
-        */
-       is_pm_resume = rq->cmd_type == REQ_TYPE_PM_RESUME;
-
        spin_lock_irq(q->queue_lock);
 
        if (unlikely(blk_queue_dying(q))) {
@@ -88,9 +81,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 
        __elv_add_request(q, rq, where);
        __blk_run_queue(q);
-       /* the queue is stopped so it won't be run */
-       if (is_pm_resume)
-               __blk_run_queue_uncond(q);
        spin_unlock_irq(q->queue_lock);
 }
 EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);