diff options
author | Christoph Hellwig <hch@lst.de> | 2014-11-03 14:15:14 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-12 05:19:43 -0500 |
commit | c8b09f6fb67df7fc1b51ced1037fa9b677428149 (patch) | |
tree | 87527c3e17a7539c0ffa9f64fbd85ec2ad3dabf1 /drivers/scsi/libiscsi.c | |
parent | 2ecb204d07ac8debe3893c362415919bc78bebd6 (diff) |
scsi: don't set tagging state from scsi_adjust_queue_depth
Remove the tagged argument from scsi_adjust_queue_depth, and just let it
handle the queue depth. For most drivers those two are fairly separate,
given that most modern drivers don't care about the SCSI "tagged" status
of a command at all, and many old drivers allow queuing of multiple
untagged commands in the driver.
Instead we start out with the ->simple_tags flag set before calling
->slave_configure, which is how all drivers actually looking at
->simple_tags except for one worke anyway. The one other case looks
broken, but I've kept the behavior as-is for now.
Except for that we only change ->simple_tags from the ->change_queue_type,
and when rejecting a tag message in a single driver, so keeping this
churn out of scsi_adjust_queue_depth is a clear win.
Now that the usage of scsi_adjust_queue_depth is more obvious we can
also remove all the trivial instances in ->slave_alloc or ->slave_configure
that just set it to the cmd_per_lun default.
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: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
-rw-r--r-- | drivers/scsi/libiscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 0d8bc6c66650..d521624dedfb 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
@@ -1775,13 +1775,13 @@ int iscsi_change_queue_depth(struct scsi_device *sdev, int depth, int reason) | |||
1775 | { | 1775 | { |
1776 | switch (reason) { | 1776 | switch (reason) { |
1777 | case SCSI_QDEPTH_DEFAULT: | 1777 | case SCSI_QDEPTH_DEFAULT: |
1778 | scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth); | 1778 | scsi_adjust_queue_depth(sdev, depth); |
1779 | break; | 1779 | break; |
1780 | case SCSI_QDEPTH_QFULL: | 1780 | case SCSI_QDEPTH_QFULL: |
1781 | scsi_track_queue_full(sdev, depth); | 1781 | scsi_track_queue_full(sdev, depth); |
1782 | break; | 1782 | break; |
1783 | case SCSI_QDEPTH_RAMP_UP: | 1783 | case SCSI_QDEPTH_RAMP_UP: |
1784 | scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth); | 1784 | scsi_adjust_queue_depth(sdev, depth); |
1785 | break; | 1785 | break; |
1786 | default: | 1786 | default: |
1787 | return -EOPNOTSUPP; | 1787 | return -EOPNOTSUPP; |