diff options
author | Christoph Hellwig <hch@lst.de> | 2014-11-13 08:25:11 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-24 08:45:12 -0500 |
commit | c40ecc12cfdb630332198a04e2832ae8218a61f1 (patch) | |
tree | 881456a7d46ca017dba4cc003e2fe1be427614fc /drivers/scsi/libsas | |
parent | 89dac7bb3b0494685241369951f95494e86ee61f (diff) |
scsi: avoid ->change_queue_depth indirection for queue full tracking
All drivers use the implementation for ramping the queue up and down, so
instead of overloading the change_queue_depth method call the
implementation diretly if the driver opts into it by setting the
track_queue_depth flag in the host template.
Note that a few drivers validated the new queue depth in their
change_queue_depth method, but as we never go over the queue depth
set during slave_configure or the sysfs file this isn't nessecary
and can safely be removed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Venkatesh Srinivas <venkateshs@google.com>
Diffstat (limited to 'drivers/scsi/libsas')
-rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 89e8b687a679..914e41165137 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c | |||
@@ -961,20 +961,9 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth, int reason) | |||
961 | return __ata_change_queue_depth(dev->sata_dev.ap, sdev, depth, | 961 | return __ata_change_queue_depth(dev->sata_dev.ap, sdev, depth, |
962 | reason); | 962 | reason); |
963 | 963 | ||
964 | switch (reason) { | 964 | if (!sdev->tagged_supported) |
965 | case SCSI_QDEPTH_DEFAULT: | 965 | depth = 1; |
966 | case SCSI_QDEPTH_RAMP_UP: | 966 | scsi_adjust_queue_depth(sdev, depth); |
967 | if (!sdev->tagged_supported) | ||
968 | depth = 1; | ||
969 | scsi_adjust_queue_depth(sdev, depth); | ||
970 | break; | ||
971 | case SCSI_QDEPTH_QFULL: | ||
972 | scsi_track_queue_full(sdev, depth); | ||
973 | break; | ||
974 | default: | ||
975 | return -EOPNOTSUPP; | ||
976 | } | ||
977 | |||
978 | return depth; | 967 | return depth; |
979 | } | 968 | } |
980 | 969 | ||