Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

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

diff --git a/block/blk-exec.c b/block/blk-exec.c
index f7b292f1244960b8ed74f199e9150d12517c1b7b..a34b7d9187426cbfe93bb5d8115da2b62fadd1fb 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -48,8 +48,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
                           struct request *rq, int at_head,
                           rq_end_io_fn *done)
 {
-       int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
-
        WARN_ON(irqs_disabled());
        WARN_ON(!blk_rq_is_passthrough(rq));
 
@@ -60,23 +58,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
         * don't check dying flag for MQ because the request won't
         * be reused after dying flag is set
         */
-       if (q->mq_ops) {
-               blk_mq_sched_insert_request(rq, at_head, true, false);
-               return;
-       }
-
-       spin_lock_irq(q->queue_lock);
-
-       if (unlikely(blk_queue_dying(q))) {
-               rq->rq_flags |= RQF_QUIET;
-               __blk_end_request_all(rq, BLK_STS_IOERR);
-               spin_unlock_irq(q->queue_lock);
-               return;
-       }
-
-       __elv_add_request(q, rq, where);
-       __blk_run_queue(q);
-       spin_unlock_irq(q->queue_lock);
+       blk_mq_sched_insert_request(rq, at_head, true, false);
 }
 EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);