From 37368eda11be49599027508f19861cfa6487bcd9 Mon Sep 17 00:00:00 2001 From: Jeff Moyer Date: Mon, 17 Oct 2011 12:57:23 +0200 Subject: [PATCH] --- yaml --- r: 273808 b: refs/heads/master c: e67b77c791ca2778198c9e7088f3266ed2da7a55 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 2 ++ trunk/block/blk-flush.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 497da17665d7..f35462e55f35 100644 --- 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 index d34433ae7917..795154e54a75 100644 --- 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 index 89ae3b9bf7ca..720ad607ff91 100644 --- 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; }