diff --git a/[refs] b/[refs] index 2b1176907262..c47bcec6b2fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 753c89130c52b96e66e5ceff19bd1336de9a5ce8 +refs/heads/master: bf7919371025412978268efca4b09dd847acb395 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index f5b59e18ebd3..15b53616516a 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -2490,9 +2490,9 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE || cfqd->busy_queues > 1) { del_timer(&cfqd->idle_slice_timer); - __blk_run_queue(cfqd->queue); - } - cfq_mark_cfqq_must_dispatch(cfqq); + __blk_run_queue(cfqd->queue); + } else + cfq_mark_cfqq_must_dispatch(cfqq); } } else if (cfq_should_preempt(cfqd, cfqq, rq)) { /*