diff options
| author | Jens Axboe <axboe@fb.com> | 2015-07-13 08:24:39 -0600 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-07-16 16:09:53 +0300 |
| commit | 1278dd6809b11dc298e19d81ac0916275f7318c1 (patch) | |
| tree | 9488b822407f575d6fbbdacebe61df18fe87d5da /drivers/scsi | |
| parent | e7ac6c6666bec0a354758a1298d3231e4a635362 (diff) | |
| download | linux-1278dd6809b11dc298e19d81ac0916275f7318c1.tar.gz linux-1278dd6809b11dc298e19d81ac0916275f7318c1.tar.bz2 linux-1278dd6809b11dc298e19d81ac0916275f7318c1.zip | |
scsi: fix host max depth checking for the 'queue_depth' sysfs interface
Commit 1e6f2416044c0 changed the scsi sysfs 'queue_depth' code to
rejects depths higher than the scsi host template setting. But lots
of hosts set this to 1, and update the settings in the scsi host
when the controller/devices probing happens.
This breaks (at least) mpt2sas and mpt3sas runtime setting of queue
depth, returning EINVAL for all settings but '1'. And once it's set to
1, there's no way to go back up.
Cc: stable@vger.kernel.org
Fixes: 1e6f2416044c0 "scsi: don't allow setting of queue_depth bigger than can_queue"
Signed-off-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 1ac38e73df7e..9ad41168d26d 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -859,7 +859,7 @@ sdev_store_queue_depth(struct device *dev, struct device_attribute *attr, depth = simple_strtoul(buf, NULL, 0); - if (depth < 1 || depth > sht->can_queue) + if (depth < 1 || depth > sdev->host->can_queue) return -EINVAL; retval = sht->change_queue_depth(sdev, depth); |