1 files changed, 12 insertions, 4 deletions

diff --git a/block/elevator.c b/block/elevator.c
index 9b1d42b62f20..9edba1b8323e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -458,6 +458,7 @@ static bool elv_attempt_insert_merge(struct request_queue *q,
                                      struct request *rq)
 {
         struct request *__rq;
+        bool ret;
 
         if (blk_queue_nomerges(q))
                 return false;
@@ -471,14 +472,21 @@ static bool elv_attempt_insert_merge(struct request_queue *q,
         if (blk_queue_noxmerges(q))
                 return false;
 
+        ret = false;
         /*
          * See if our hash lookup can find a potential backmerge.
          */
-        __rq = elv_rqhash_find(q, blk_rq_pos(rq));
-        if (__rq && blk_attempt_req_merge(q, __rq, rq))
-                return true;
+        while (1) {
+                __rq = elv_rqhash_find(q, blk_rq_pos(rq));
+                if (!__rq || !blk_attempt_req_merge(q, __rq, rq))
+                        break;
 
-        return false;
+                /* The merged request could be merged with others, try again */
+                ret = true;
+                rq = __rq;
+        }
+
+        return ret;
 }
 
 void elv_merged_request(struct request_queue *q, struct request *rq, int type)