path: root/block/blk-settings.c
diff options
authorJens Axboe <>2008-09-14 05:55:09 -0700
committerJens Axboe <>2008-10-09 08:56:13 +0200
commit242f9dcb8ba6f68fcd217a119a7648a4f69290e9 (patch)
tree1bfe245ffbc50d204d76665cd8f90d85100f86a1 /block/blk-settings.c
parent608aeef17a91747d6303de4df5e2c2e6899a95e8 (diff)
block: unify request timeout handling
Right now SCSI and others do their own command timeout handling. Move those bits to the block layer. Instead of having a timer per command, we try to be a bit more clever and simply have one per-queue. This avoids the overhead of having to tear down and setup a timer for each command, so it will result in a lot less timer fiddling. Signed-off-by: Mike Anderson <> Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block/blk-settings.c')
1 files changed, 12 insertions, 0 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index d70692badcd..1d0330d0b40 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -77,6 +77,18 @@ void blk_queue_softirq_done(struct request_queue *q, softirq_done_fn *fn)
+void blk_queue_rq_timeout(struct request_queue *q, unsigned int timeout)
+ q->rq_timeout = timeout;
+void blk_queue_rq_timed_out(struct request_queue *q, rq_timed_out_fn *fn)
+ q->rq_timed_out_fn = fn;
* blk_queue_make_request - define an alternate make_request function for a device
* @q: the request queue for the device to be affected