blkio: Set must_dispatch only if we decided to not dispatch the request
authorVivek Goyal <vgoyal@redhat.com>
Thu, 3 Dec 2009 17:59:37 +0000 (12:59 -0500)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 3 Dec 2009 18:28:51 +0000 (19:28 +0100)
o must_dispatch flag should be set only if we decided not to run the queue
  and dispatch the request.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/cfq-iosched.c

index f5b59e1..15b5361 100644 (file)
@@ -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)) {
                /*