diff options
author | Christoph Hellwig <hch@lst.de> | 2015-10-30 08:57:30 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-12-22 11:38:16 -0500 |
commit | 287922eb0b186e2a5bf54fdd04b734c25c90035c (patch) | |
tree | bf7e8976139ac3eacfaab6ace9d1807088463140 /block/blk.h | |
parent | 8c0b39155048d5a24f25c6c60aa83729927b04cd (diff) |
block: defer timeouts to a workqueue
Timer context is not very useful for drivers to perform any meaningful abort
action from. So instead of calling the driver from this useless context
defer it to a workqueue as soon as possible.
Note that while a delayed_work item would seem the right thing here I didn't
dare to use it due to the magic in blk_add_timer that pokes deep into timer
internals. But maybe this encourages Tejun to add a sensible API for that to
the workqueue API and we'll all be fine in the end :)
Contains a major update from Keith Bush:
"This patch removes synchronizing the timeout work so that the timer can
start a freeze on its own queue. The timer enters the queue, so timer
context can only start a freeze, but not wait for frozen."
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk.h')
-rw-r--r-- | block/blk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index c43926d3d74d..70e4aee9cdcb 100644 --- a/block/blk.h +++ b/block/blk.h | |||
@@ -93,7 +93,7 @@ static inline void blk_flush_integrity(void) | |||
93 | } | 93 | } |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | void blk_rq_timed_out_timer(unsigned long data); | 96 | void blk_timeout_work(struct work_struct *work); |
97 | unsigned long blk_rq_timeout(unsigned long timeout); | 97 | unsigned long blk_rq_timeout(unsigned long timeout); |
98 | void blk_add_timer(struct request *req); | 98 | void blk_add_timer(struct request *req); |
99 | void blk_delete_timer(struct request *); | 99 | void blk_delete_timer(struct request *); |