diff options
Diffstat (limited to 'block/blk-exec.c')
-rw-r--r-- | block/blk-exec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c index 9924725fa50d..3fec8a29d0fa 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c | |||
@@ -53,7 +53,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, | |||
53 | rq_end_io_fn *done) | 53 | rq_end_io_fn *done) |
54 | { | 54 | { |
55 | int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; | 55 | int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; |
56 | bool is_pm_resume; | ||
57 | 56 | ||
58 | WARN_ON(irqs_disabled()); | 57 | WARN_ON(irqs_disabled()); |
59 | WARN_ON(rq->cmd_type == REQ_TYPE_FS); | 58 | 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, | |||
70 | return; | 69 | return; |
71 | } | 70 | } |
72 | 71 | ||
73 | /* | ||
74 | * need to check this before __blk_run_queue(), because rq can | ||
75 | * be freed before that returns. | ||
76 | */ | ||
77 | is_pm_resume = rq->cmd_type == REQ_TYPE_PM_RESUME; | ||
78 | |||
79 | spin_lock_irq(q->queue_lock); | 72 | spin_lock_irq(q->queue_lock); |
80 | 73 | ||
81 | if (unlikely(blk_queue_dying(q))) { | 74 | if (unlikely(blk_queue_dying(q))) { |
@@ -88,9 +81,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, | |||
88 | 81 | ||
89 | __elv_add_request(q, rq, where); | 82 | __elv_add_request(q, rq, where); |
90 | __blk_run_queue(q); | 83 | __blk_run_queue(q); |
91 | /* the queue is stopped so it won't be run */ | ||
92 | if (is_pm_resume) | ||
93 | __blk_run_queue_uncond(q); | ||
94 | spin_unlock_irq(q->queue_lock); | 84 | spin_unlock_irq(q->queue_lock); |
95 | } | 85 | } |
96 | EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); | 86 | EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); |