From: Jens Axboe <jaxboe@fusionio.com>
Date: Wed, 30 Mar 2011 11:27:09 +0000 (+0200)
Subject: block: make the flush insertion use the tail of the dispatch list
X-Git-Tag: Ubuntu-5.0.0-8.9~19315^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=53d63e6b0dfb95882ec0219ba6bbd50cde423794;p=mirror_ubuntu-disco-kernel.git

block: make the flush insertion use the tail of the dispatch list

It's not a preempt type request, in fact we have to insert it
behind requests that do specify INSERT_FRONT.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/block/blk-flush.c b/block/blk-flush.c
index d6275cbbaf35..eba4a2790c6c 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -261,7 +261,7 @@ static bool blk_kick_flush(struct request_queue *q)
 	q->flush_rq.end_io = flush_end_io;
 
 	q->flush_pending_idx ^= 1;
-	__elv_add_request(q, &q->flush_rq, ELEVATOR_INSERT_REQUEUE);
+	list_add_tail(&q->flush_rq.queuelist, &q->queue_head);
 	return true;
 }
 
@@ -312,7 +312,7 @@ void blk_insert_flush(struct request *rq)
 	 */
 	if ((policy & REQ_FSEQ_DATA) &&
 	    !(policy & (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) {
-		list_add(&rq->queuelist, &q->queue_head);
+		list_add_tail(&rq->queuelist, &q->queue_head);
 		return;
 	}