1 files changed, 9 insertions, 13 deletions

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 1ec0d503cacd..1ba7e0aca878 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -122,10 +122,8 @@ void blk_rq_timed_out_timer(unsigned long data)
                         if (blk_mark_rq_complete(rq))
                                 continue;
                         blk_rq_timed_out(rq);
-                } else {
-                        if (!next || time_after(next, rq->deadline))
-                                next = rq->deadline;
-                }
+                } else if (!next || time_after(next, rq->deadline))
+                        next = rq->deadline;
         }
 
         /*
@@ -176,16 +174,14 @@ void blk_add_timer(struct request *req)
         BUG_ON(!list_empty(&req->timeout_list));
         BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
 
-        if (req->timeout)
-                req->deadline = jiffies + req->timeout;
-        else {
-                req->deadline = jiffies + q->rq_timeout;
-                /*
-                 * Some LLDs, like scsi, peek at the timeout to prevent
-                 * a command from being retried forever.
-                 */
+        /*
+         * Some LLDs, like scsi, peek at the timeout to prevent a
+         * command from being retried forever.
+         */
+        if (!req->timeout)
                 req->timeout = q->rq_timeout;
-        }
+
+        req->deadline = jiffies + req->timeout;
         list_add_tail(&req->timeout_list, &q->timeout_list);
 
         /*