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/ata/libata-scsi.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/ata/libata-scsi.c')
-rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 0586f66d70fa..c8bb6abbf12c 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -1164,7 +1164,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev, | |||
1164 | 1164 | ||
1165 | depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id)); | 1165 | depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id)); |
1166 | depth = min(ATA_MAX_QUEUE - 1, depth); | 1166 | depth = min(ATA_MAX_QUEUE - 1, depth); |
1167 | scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth); | 1167 | scsi_adjust_queue_depth(sdev, depth); |
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | blk_queue_flush_queueable(q, false); | 1170 | blk_queue_flush_queueable(q, false); |
@@ -1282,7 +1282,7 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, | |||
1282 | if (sdev->queue_depth == queue_depth) | 1282 | if (sdev->queue_depth == queue_depth) |
1283 | return -EINVAL; | 1283 | return -EINVAL; |
1284 | 1284 | ||
1285 | scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth); | 1285 | scsi_adjust_queue_depth(sdev, queue_depth); |
1286 | return queue_depth; | 1286 | return queue_depth; |
1287 | } | 1287 | } |
1288 | 1288 | ||