scsi: scsi_debug: Drop check for num_in_q exceeding queue depth
authorJohn Garry <john.g.garry@oracle.com>
Mon, 13 Mar 2023 09:31:11 +0000 (09:31 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 17 Mar 2023 03:25:37 +0000 (23:25 -0400)
The per-device num_in_q value cannot exceed the device queue depth, so drop
the check.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Link: https://lore.kernel.org/r/20230313093114.1498305-9-john.g.garry@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_debug.c

index 46fd84d..88f40aa 100644 (file)
@@ -5593,15 +5593,8 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,
        }
        num_in_q = atomic_read(&devip->num_in_q);
        qdepth = cmnd->device->queue_depth;
-       if (unlikely((qdepth > 0) && (num_in_q >= qdepth))) {
-               if (scsi_result) {
-                       spin_unlock_irqrestore(&sqp->qc_lock, iflags);
-                       goto respond_in_thread;
-               } else
-                       scsi_result = device_qfull_result;
-       } else if (unlikely(sdebug_every_nth &&
-                           (SDEBUG_OPT_RARE_TSF & sdebug_opts) &&
-                           (scsi_result == 0))) {
+       if (unlikely(sdebug_every_nth && (SDEBUG_OPT_RARE_TSF & sdebug_opts) &&
+                    (scsi_result == 0))) {
                if ((num_in_q == (qdepth - 1)) &&
                    (atomic_inc_return(&sdebug_a_tsf) >=
                     abs(sdebug_every_nth))) {