Revert "scsi: core: run queue if SCSI device queue isn't ready and queue is idle"

This reverts commit 9e865ddcb801d113bc993959ddee70c5cf966a18.

Now that we have the patches ("blk-mq: In blk_mq_dispatch_rq_list()
"no budget" is a reason to kick") and ("blk-mq: Rerun dispatching in
the case of budget contention") we should no longer need the fix in
the SCSI code.  Revert it, resolving conflicts with other patches that
have touched this code.

With this revert (and the two new patches) I can run the script that
was in commit 9e865ddcb801 ("scsi: core: run queue if SCSI device
queue isn't ready and queue is idle") in a loop with no failure.  If I
do this revert without the two new patches I can easily get a failure.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 47835c4b4ee05016420f07f0bf63c015879e5009..ea18f618dc66f89f01e14257904911fd8f6c0af8 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1610,12 +1610,7 @@ static bool scsi_mq_get_budget(struct blk_mq_hw_ctx *hctx)
        struct request_queue *q = hctx->queue;
        struct scsi_device *sdev = q->queuedata;
 
-       if (scsi_dev_queue_ready(q, sdev))
-               return true;
-
-       if (atomic_read(&sdev->device_busy) == 0 && !scsi_device_blocked(sdev))
-               blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY);
-       return false;
+       return scsi_dev_queue_ready(q, sdev);
 }
 
 static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,