|
@@ -52,11 +52,17 @@ 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());
|
|
|
|
|
|
rq->rq_disk = bd_disk;
|
|
|
rq->end_io = done;
|
|
|
+ /*
|
|
|
+ * 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);
|
|
|
|
|
@@ -71,7 +77,7 @@ 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 (rq->cmd_type == REQ_TYPE_PM_RESUME)
|
|
|
+ if (is_pm_resume)
|
|
|
q->request_fn(q);
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
}
|