-----Original Message----- From: linux-scsi-owner@xxxxxxxxxxxxxxx [mailto:linux-scsi-owner@xxxxxxxxxxxxxxx] On Behalf Of dan.carpenter@xxxxxxxxxx Sent: Monday, July 27, 2020 6:19 AM To: don.brace@xxxxxxxxxxxxx Hello Don Brace, The patch c73deaf3b001: "scsi: hpsa: Increase controller error handling timeout" from Jul 20, 2020, leads to the following static checker warning: drivers/scsi/hpsa.c:2163 hpsa_slave_configure() error: uninitialized symbol 'queue_depth'. I uploaded the patch bellow on Friday to correct this. I should have asked for the patch to be squashed into this patch. commit e5ad119720fd64cb7dd1fdd41e12f2fa5655b608 Author: Don Brace <don.brace@xxxxxxxxxxxxx> Date: Fri Jul 24 15:26:39 2020 -0500 hpsa: correct ctrl queue depth - need to set queue depth for controller devices. - corrects compiler warning in patch: hpsa-increase-ctlr-eh-timeout Reviewed-by: Scott Teel <scott.teel@xxxxxxxxxxxxx> Signed-off-by: Don Brace <don.brace@xxxxxxxxxxxxx> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 90c36d75bf92..91794a50b31f 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -2145,20 +2145,21 @@ static int hpsa_slave_configure(struct scsi_device *sdev) if (sd) { sd->was_removed = 0; + queue_depth = sd->queue_depth != 0 ? + sd->queue_depth : sdev->host->can_queue; if (sd->external) { queue_depth = EXTERNAL_QD; sdev->eh_timeout = HPSA_EH_PTRAID_TIMEOUT; blk_queue_rq_timeout(sdev->request_queue, HPSA_EH_PTRAID_TIMEOUT); - } else if (is_hba_lunid(sd->scsi3addr)) { + } + if (is_hba_lunid(sd->scsi3addr)) { sdev->eh_timeout = CTLR_TIMEOUT; blk_queue_rq_timeout(sdev->request_queue, CTLR_TIMEOUT); - } else { - queue_depth = sd->queue_depth != 0 ? - sd->queue_depth : sdev->host->can_queue; } - } else + } else { queue_depth = sdev->host->can_queue; + } scsi_change_queue_depth(sdev, queue_depth); regards, dan carpenter
