aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Piggin <nickpiggin@yahoo.com.au>2005-06-23 03:08:54 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:16 -0400
commitbdd646a44672115c986593956aa4ef105485a184 (patch)
tree705b347a9c84fe7dcc040b468cadf28bde332bcf
parentfde6ad22480cdc2eaa102b805a3ed3ee1d36a376 (diff)
[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>
-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)
1969 DEFINE_WAIT(wait); 1969 DEFINE_WAIT(wait);
1970 struct request *rq; 1970 struct request *rq;
1971 1971
1972 generic_unplug_device(q);
1973 do { 1972 do {
1974 struct request_list *rl = &q->rq; 1973 struct request_list *rl = &q->rq;
1975 1974
@@ -1981,6 +1980,7 @@ static struct request *get_request_wait(request_queue_t *q, int rw)
1981 if (!rq) { 1980 if (!rq) {
1982 struct io_context *ioc; 1981 struct io_context *ioc;
1983 1982
1983 generic_unplug_device(q);
1984 io_schedule(); 1984 io_schedule();
1985 1985
1986 /* 1986 /*