diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-12-10 21:00:57 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-12-10 21:00:57 -0500 |
commit | e84234c00f528f866387d16a831716d8a94356ea (patch) | |
tree | 3015acf5a1f1dbfebd9e22c6292e9e6d063dfe9e /block | |
parent | 140ab905166b78152ba5d40ae8d3accf905d3dc3 (diff) | |
parent | 20c7bbdde3de202d847f7e9f14cbd7ffeb03e81e (diff) |
Merge tag 'v3.2.35' into v3.2-rt
This is the 3.2.35 stable release
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-exec.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c index 60532852b3ab..ac2c6e7f0538 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -49,6 +49,7 @@ 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; if (unlikely(blk_queue_dead(q))) { rq->errors = -ENXIO; @@ -59,12 +60,18 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 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; + WARN_ON(irqs_disabled()); spin_lock_irq(q->queue_lock); __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); } |