summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-15 21:21:43 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-15 21:21:43 +0200
commit9a2d43b7566caeeeb414aa628bc2759028897dbb (patch)
tree829829bb1649b9727f600d076d55e349fd589511 /block
parent64ea1b4ab7f51c5de601d291a51508c27d445f70 (diff)
downloadlinux-9a2d43b7566caeeeb414aa628bc2759028897dbb.tar.gz
linux-9a2d43b7566caeeeb414aa628bc2759028897dbb.tar.bz2
linux-9a2d43b7566caeeeb414aa628bc2759028897dbb.zip
block: handle blk_pm_resume_request() requests in blk_execute_rq_nowait()
For blk_pm_resume_request() requests (which are used only by IDE subsystem currently) the queue is stopped so we need to call ->request_fn explicitly. Thanks to: - Rafael for reporting/bisecting the bug - Borislav/Rafael for testing the fix This is a preparation for converting IDE to use blk_execute_rq(). Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Borislav Petkov <petkovbb@gmail.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-exec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c
index 391dd6224890..4f52f2792059 100644
--- a/block/blk-exec.c
+++ b/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);