2 files changed, 6 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 0852e5d43436..93a18d1d3da8 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2315,6 +2315,9 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
                 case -EBADE:
                         error_type = "critical nexus";
                         break;
+                case -ETIMEDOUT:
+                        error_type = "timeout";
+                        break;
                 case -EIO:
                 default:
                         error_type = "I/O";
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 6e4744cbfb56..65f103563969 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);