summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-30 12:22:23 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-04-05 23:51:37 +0200
commit929e27252e8ca69363f81f26af5eaba62cb4c572 (patch)
tree12dea354d609e42222195f8b6cbe5728893de01b
parent6f0379377047b18103b88ce33c03e5b19747ae57 (diff)
downloadlinux-929e27252e8ca69363f81f26af5eaba62cb4c572.tar.bz2
ide: ide_requeue_and_plug() reinstate "always plug" behaviour
We see stalls if we don't always ensure that the queue gets run again. Even if rq == NULL, we could have other pending requests in the queue. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--drivers/ide/ide-io.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 0e406d73b2c8..ca27d3090aeb 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -570,8 +570,7 @@ void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
spin_unlock_irqrestore(q->queue_lock, flags);
/* Use 3ms as that was the old plug delay */
- if (rq)
- blk_delay_queue(q, 3);
+ blk_delay_queue(q, 3);
}
static int drive_is_ready(ide_drive_t *drive)