diff --git a/[refs] b/[refs] index bb92548dafd4..5cb4bc4acc70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64ea1b4ab7f51c5de601d291a51508c27d445f70 +refs/heads/master: 9a2d43b7566caeeeb414aa628bc2759028897dbb diff --git a/trunk/block/blk-exec.c b/trunk/block/blk-exec.c index 391dd6224890..4f52f2792059 100644 --- a/trunk/block/blk-exec.c +++ b/trunk/block/blk-exec.c @@ -58,6 +58,9 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, spin_lock_irq(q->queue_lock); __elv_add_request(q, rq, where, 1); __generic_unplug_device(q); + /* the queue is stopped so it won't be plugged+unplugged */ + if (blk_pm_resume_request(rq)) + q->request_fn(q); spin_unlock_irq(q->queue_lock); } EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);