diff options
author | Christoph Hellwig <hch@lst.de> | 2014-09-13 23:40:13 (GMT) |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-09-22 18:00:07 (GMT) |
commit | 0152fb6b57c4fae769ee75ea2ae670f4ff39fba9 (patch) | |
tree | f59f4c6703c1914bc65607f21ae8c868b995f245 /include | |
parent | 46f92d42ee37e10970e33891b7b61a342bd97aeb (diff) | |
download | linux-0152fb6b57c4fae769ee75ea2ae670f4ff39fba9.tar.xz |
blk-mq: pass a reserved argument to the timeout handler
Allow blk-mq to pass an argument to the timeout handler to indicate
if we're timing out a reserved or regular command. For many drivers
those need to be handled different.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/blk-mq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 0eb0f64..3253495 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -79,6 +79,7 @@ struct blk_mq_tag_set { typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, struct request *, bool); typedef struct blk_mq_hw_ctx *(map_queue_fn)(struct request_queue *, const int); +typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool); typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int); typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int); typedef int (init_request_fn)(void *, struct request *, unsigned int, @@ -103,7 +104,7 @@ struct blk_mq_ops { /* * Called on request timeout */ - rq_timed_out_fn *timeout; + timeout_fn *timeout; softirq_done_fn *complete; |