aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 91e18f8af9be..99838f460b44 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -515,6 +515,7 @@ static bool elv_attempt_insert_merge(struct request_queue *q,
515 struct request *rq) 515 struct request *rq)
516{ 516{
517 struct request *__rq; 517 struct request *__rq;
518 bool ret;
518 519
519 if (blk_queue_nomerges(q)) 520 if (blk_queue_nomerges(q))
520 return false; 521 return false;
@@ -528,14 +529,21 @@ static bool elv_attempt_insert_merge(struct request_queue *q,
528 if (blk_queue_noxmerges(q)) 529 if (blk_queue_noxmerges(q))
529 return false; 530 return false;
530 531
532 ret = false;
531 /* 533 /*
532 * See if our hash lookup can find a potential backmerge. 534 * See if our hash lookup can find a potential backmerge.
533 */ 535 */
534 __rq = elv_rqhash_find(q, blk_rq_pos(rq)); 536 while (1) {
535 if (__rq && blk_attempt_req_merge(q, __rq, rq)) 537 __rq = elv_rqhash_find(q, blk_rq_pos(rq));
536 return true; 538 if (!__rq || !blk_attempt_req_merge(q, __rq, rq))
539 break;
537 540
538 return false; 541 /* The merged request could be merged with others, try again */
542 ret = true;
543 rq = __rq;
544 }
545
546 return ret;
539} 547}
540 548
541void elv_merged_request(struct request_queue *q, struct request *rq, int type) 549void elv_merged_request(struct request_queue *q, struct request *rq, int type)