aboutsummaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 3cd0d8c84902..2a0b653c90fd 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -666,7 +666,8 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)
666 q->boundary_rq = rq; 666 q->boundary_rq = rq;
667 } 667 }
668 } else if (!(rq->cmd_flags & REQ_ELVPRIV) && 668 } else if (!(rq->cmd_flags & REQ_ELVPRIV) &&
669 where == ELEVATOR_INSERT_SORT) 669 (where == ELEVATOR_INSERT_SORT ||
670 where == ELEVATOR_INSERT_SORT_MERGE))
670 where = ELEVATOR_INSERT_BACK; 671 where = ELEVATOR_INSERT_BACK;
671 672
672 switch (where) { 673 switch (where) {