summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorNick Piggin <nickpiggin@yahoo.com.au>2005-06-23 11:08:54 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 20:45:16 +0400
commitbdd646a44672115c986593956aa4ef105485a184 (patch)
tree705b347a9c84fe7dcc040b468cadf28bde332bcf /drivers/block
parentfde6ad22480cdc2eaa102b805a3ed3ee1d36a376 (diff)
downloadlinux-bdd646a44672115c986593956aa4ef105485a184.tar.xz
[PATCH] blk: unplug later
get_request_wait needn't unplug the device immediately. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/ll_rw_blk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 1e847151c3a3..fd94ea27d594 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -1969,7 +1969,6 @@ static struct request *get_request_wait(request_queue_t *q, int rw)
DEFINE_WAIT(wait);
struct request *rq;
- generic_unplug_device(q);
do {
struct request_list *rl = &q->rq;
@@ -1981,6 +1980,7 @@ static struct request *get_request_wait(request_queue_t *q, int rw)
if (!rq) {
struct io_context *ioc;
+ generic_unplug_device(q);
io_schedule();
/*