diff options
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index fb52df9744f5..e62e9205b80a 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -1973,7 +1973,8 @@ cfq_merged_requests(struct request_queue *q, struct request *rq, | |||
| 1973 | * reposition in fifo if next is older than rq | 1973 | * reposition in fifo if next is older than rq |
| 1974 | */ | 1974 | */ |
| 1975 | if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) && | 1975 | if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) && |
| 1976 | time_before(rq_fifo_time(next), rq_fifo_time(rq))) { | 1976 | time_before(rq_fifo_time(next), rq_fifo_time(rq)) && |
| 1977 | cfqq == RQ_CFQQ(next)) { | ||
| 1977 | list_move(&rq->queuelist, &next->queuelist); | 1978 | list_move(&rq->queuelist, &next->queuelist); |
| 1978 | rq_set_fifo_time(rq, rq_fifo_time(next)); | 1979 | rq_set_fifo_time(rq, rq_fifo_time(next)); |
| 1979 | } | 1980 | } |