X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=e62e9205b80a8047193cd32a690a0e5d5b689b85;hb=c2974058a9caa82c9dd9e1e11e4f2c6ce42ff17e;hp=fb52df9744f5fe411908162fbb02257ca0bc097a;hpb=a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index fb52df9..e62e920 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,
 	 * reposition in fifo if next is older than rq
 	 */
 	if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) &&
-	    time_before(rq_fifo_time(next), rq_fifo_time(rq))) {
+	    time_before(rq_fifo_time(next), rq_fifo_time(rq)) &&
+	    cfqq == RQ_CFQQ(next)) {
 		list_move(&rq->queuelist, &next->queuelist);
 		rq_set_fifo_time(rq, rq_fifo_time(next));
 	}