diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-11-13 14:27:41 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-24 14:45:26 +0100 |
| commit | 1e6f2416044c062a56091ebf8d76760956dd5872 (patch) | |
| tree | 53b83ab97cc475c37f957bb85167ae8cb2ccd550 /drivers/scsi/vmw_pvscsi.c | |
| parent | c40ecc12cfdb630332198a04e2832ae8218a61f1 (diff) | |
| download | lwn-1e6f2416044c062a56091ebf8d76760956dd5872.tar.gz lwn-1e6f2416044c062a56091ebf8d76760956dd5872.zip | |
scsi: don't allow setting of queue_depth bigger than can_queue
We won't ever queue more commands than the host allows. Instead of
letting drivers either reject or ignore this case handle it in
common code. Note that various driver use internal constant or
variables that are assigned to both shost->can_queue and checked
in ->change_queue_depth - I did remove those checks as well.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'drivers/scsi/vmw_pvscsi.c')
| -rw-r--r-- | drivers/scsi/vmw_pvscsi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index 4a01c0598a2f..03ad24be728e 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -508,20 +508,14 @@ static int pvscsi_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) { - int max_depth; - struct Scsi_Host *shost = sdev->host; - if (reason != SCSI_QDEPTH_DEFAULT) /* * We support only changing default. */ return -EOPNOTSUPP; - max_depth = shost->can_queue; if (!sdev->tagged_supported) - max_depth = 1; - if (qdepth > max_depth) - qdepth = max_depth; + qdepth = 1; scsi_adjust_queue_depth(sdev, qdepth); if (sdev->inquiry_len > 7) |