2 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 0a00e4ecf87c..5e00b5a58f6a 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2227,6 +2227,7 @@ void blk_start_request(struct request *req)
         if (unlikely(blk_bidi_rq(req)))
                 req->next_rq->resid_len = blk_rq_bytes(req->next_rq);
 
+        BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
         blk_add_timer(req);
 }
 EXPORT_SYMBOL(blk_start_request);
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 65f103563969..655ba909cd6a 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -91,8 +91,8 @@ static void blk_rq_timed_out(struct request *req)
                 __blk_complete_request(req);
                 break;
         case BLK_EH_RESET_TIMER:
-                blk_clear_rq_complete(req);
                 blk_add_timer(req);
+                blk_clear_rq_complete(req);
                 break;
         case BLK_EH_NOT_HANDLED:
                 /*
@@ -174,7 +174,6 @@ void blk_add_timer(struct request *req)
                 return;
 
         BUG_ON(!list_empty(&req->timeout_list));
-        BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
 
         /*
          * Some LLDs, like scsi, peek at the timeout to prevent a