---

yaml --- r: 273808 b: refs/heads/master c: e67b77c h: refs/heads/master v: v3
git-mirror · Oct 24, 2011 · 37368ed · 37368ed
1 parent f78d240
commit 37368ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 834f9f61a525d2f6d3d0c93894e26326c8d3ceed
+refs/heads/master: e67b77c791ca2778198c9e7088f3266ed2da7a55
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1725,6 +1725,8 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
 		where = ELEVATOR_INSERT_FLUSH;
 
 	add_acct_request(q, rq, where);
+	if (where == ELEVATOR_INSERT_FLUSH)
+		__blk_run_queue(q);
 	spin_unlock_irqrestore(q->queue_lock, flags);
 
 	return 0;

diff --git a/trunk/block/blk-flush.c b/trunk/block/blk-flush.c
@@ -330,7 +330,6 @@ void blk_insert_flush(struct request *rq)
 	if ((policy & REQ_FSEQ_DATA) &&
 	    !(policy & (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) {
 		list_add_tail(&rq->queuelist, &q->queue_head);
-		blk_run_queue_async(q);
 		return;
 	}