aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2008-07-15 14:21:43 -0500
committerBartlomiej Zolnierkiewicz2008-07-15 14:21:43 -0500
commit9a2d43b7566caeeeb414aa628bc2759028897dbb (patch)
tree829829bb1649b9727f600d076d55e349fd589511 /block/blk-exec.c
parent64ea1b4ab7f51c5de601d291a51508c27d445f70 (diff)
downloadkernel-common-9a2d43b7566caeeeb414aa628bc2759028897dbb.tar.gz
kernel-common-9a2d43b7566caeeeb414aa628bc2759028897dbb.tar.xz
kernel-common-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/blk-exec.c')
-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 391dd622489..4f52f279205 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,
58 spin_lock_irq(q->queue_lock); 58 spin_lock_irq(q->queue_lock);
59 __elv_add_request(q, rq, where, 1); 59 __elv_add_request(q, rq, where, 1);
60 __generic_unplug_device(q); 60 __generic_unplug_device(q);
61 /* the queue is stopped so it won't be plugged+unplugged */
62 if (blk_pm_resume_request(rq))
63 q->request_fn(q);
61 spin_unlock_irq(q->queue_lock); 64 spin_unlock_irq(q->queue_lock);
62} 65}
63EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); 66EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);