Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / block / blk-exec.c

diff --git a/block/blk-exec.c b/block/blk-exec.c
index cf1456a02acdf7f4fc7fb924ff1153dcb4620c06..7482b7fa863ba10b337d7547fb7040767e02b2da 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -54,8 +54,8 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
        rq->end_io = done;
        WARN_ON(irqs_disabled());
        spin_lock_irq(q->queue_lock);
-       __elv_add_request(q, rq, where, 1);
-       __generic_unplug_device(q);
+       __elv_add_request(q, rq, where);
+       __blk_run_queue(q, false);
        /* the queue is stopped so it won't be plugged+unplugged */
        if (rq->cmd_type == REQ_TYPE_PM_RESUME)
                q->request_fn(q);