From 51c7e879b110a3e26613ae12b6d7106e694ebfe5 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Thu, 22 Nov 2012 02:00:11 -0800 Subject: [PATCH] --- yaml --- r: 335965 b: refs/heads/master c: 893d290f1d7496db97c9471bc352ad4a11dc8a25 h: refs/heads/master i: 335963: 2b70efa1753a332b0ce1012a3aae654b4b708d4b v: v3 --- [refs] | 2 +- trunk/block/blk-exec.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 997e613e9cfb..71ccfcafdc1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 836413e8c78ecbc55aa31f3cb600f8ee1aa355a2 +refs/heads/master: 893d290f1d7496db97c9471bc352ad4a11dc8a25 diff --git a/trunk/block/blk-exec.c b/trunk/block/blk-exec.c index 8b6dc5bd4dd0..f71eac35c1b9 100644 --- a/trunk/block/blk-exec.c +++ b/trunk/block/blk-exec.c @@ -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); }