Messages in this thread Patch in this message | | | From | Hannes Reinecke <> | Subject | [PATCH 7/9] block: check for timeout function in blk_rq_timed_out() | Date | Wed, 30 Jan 2013 10:26:17 +0100 |
| |
rq_timed_out_fn might have been unset while the request was in flight, so we need to check for it in blk_rq_timed_out().
Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Hannes Reinecke <hare@suse.de> --- block/blk-timeout.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 6e4744c..65f1035 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -82,9 +82,10 @@ void blk_delete_timer(struct request *req) static void blk_rq_timed_out(struct request *req) { struct request_queue *q = req->q; - enum blk_eh_timer_return ret; + enum blk_eh_timer_return ret = BLK_EH_RESET_TIMER; - ret = q->rq_timed_out_fn(req); + if (q->rq_timed_out_fn) + ret = q->rq_timed_out_fn(req); switch (ret) { case BLK_EH_HANDLED: __blk_complete_request(req); -- 1.7.4.2
| |