block: check for timeout function in blk_rq_timed_out()
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(). Acked-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Stefan Weinhuber <wein@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Родитель
d1ffc1f866
Коммит
80bd7181b0
|
@ -82,9 +82,10 @@ void blk_delete_timer(struct request *req)
|
||||||
static void blk_rq_timed_out(struct request *req)
|
static void blk_rq_timed_out(struct request *req)
|
||||||
{
|
{
|
||||||
struct request_queue *q = req->q;
|
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) {
|
switch (ret) {
|
||||||
case BLK_EH_HANDLED:
|
case BLK_EH_HANDLED:
|
||||||
__blk_complete_request(req);
|
__blk_complete_request(req);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче