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>

1 files changed, 2 insertions, 16 deletions

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 120a851df0d7..0ed96644ec94 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -121,13 +121,13 @@ static int tcm_loop_change_queue_depth(
 {
         switch (reason) {
         case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                 break;
         case SCSI_QDEPTH_QFULL:
                 scsi_track_queue_full(sdev, depth);
                 break;
         case SCSI_QDEPTH_RAMP_UP:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                 break;
         default:
                 return -EOPNOTSUPP;
@@ -404,19 +404,6 @@ static int tcm_loop_slave_alloc(struct scsi_device *sd)
         return 0;
 }
 
-static int tcm_loop_slave_configure(struct scsi_device *sd)
-{
-        if (sd->tagged_supported) {
-                scsi_adjust_queue_depth(sd, MSG_SIMPLE_TAG,
-                                        sd->host->cmd_per_lun);
-        } else {
-                scsi_adjust_queue_depth(sd, 0,
-                                        sd->host->cmd_per_lun);
-        }
-
-        return 0;
-}
-
 static struct scsi_host_template tcm_loop_driver_template = {
         .show_info              = tcm_loop_show_info,
         .proc_name              = "tcm_loopback",
@@ -434,7 +421,6 @@ static struct scsi_host_template tcm_loop_driver_template = {
         .max_sectors            = 0xFFFF,
         .use_clustering         = DISABLE_CLUSTERING,
         .slave_alloc            = tcm_loop_slave_alloc,
-        .slave_configure        = tcm_loop_slave_configure,
         .module                 = THIS_MODULE,
         .use_blk_tags           = 1,
 };