diff mbox

scsi_scan: fix queue depth initialisation problem

Message ID 1430256250.2181.17.camel@HansenPartnership.com (mailing list archive)
State New, archived
Headers show

Commit Message

James Bottomley April 28, 2015, 9:24 p.m. UTC
From: James Bottomley <JBottomley@Odin.com>
Date: Sun, 26 Apr 2015 11:52:46 -0700
Subject: [PATCH] scsi_scan: fix queue depth initialisation problem

Currently we blindly use the value of cmd_per_lun as the initial setting for
queue_depth.  This fails miserably (hangs the system) if it is zero, which is
the default value for anything uninitialised in the template.  The net result
is that every host template has to set a value for cmd_per_lun.  Instead, use
a default value of 1 if the actual value is unset.  This should pave the way
for removing cmd_per_lun from all the templates and eventually from SCSI
itself.

Signed-off-by: James Bottomley <JBottomley@Odin.com>



--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Hannes Reinecke April 29, 2015, 6:48 a.m. UTC | #1
On 04/28/2015 11:24 PM, James Bottomley wrote:
> From: James Bottomley <JBottomley@Odin.com>
> Date: Sun, 26 Apr 2015 11:52:46 -0700
> Subject: [PATCH] scsi_scan: fix queue depth initialisation problem
> 
> Currently we blindly use the value of cmd_per_lun as the initial setting for
> queue_depth.  This fails miserably (hangs the system) if it is zero, which is
> the default value for anything uninitialised in the template.  The net result
> is that every host template has to set a value for cmd_per_lun.  Instead, use
> a default value of 1 if the actual value is unset.  This should pave the way
> for removing cmd_per_lun from all the templates and eventually from SCSI
> itself.
> 
> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Tested-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
Christoph Hellwig May 11, 2015, 9:08 a.m. UTC | #2
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 60aae01..681a59a 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -280,7 +280,8 @@  static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
 				    sdev->host->cmd_per_lun, shost->bqt,
 				    shost->hostt->tag_alloc_policy);
 	}
-	scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun);
+	scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ?
+					sdev->host->cmd_per_lun : 1);
 
 	scsi_sysfs_device_initialize(sdev);