Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI update from James Bottomley:
 "This is a much shorter set of patches that were on the go but didn't
  make it in to the early pull request for the merge window.  It's
  really a set of bug fixes plus some final cleanup work on the new tag
  queue API"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  storvsc: ring buffer failures may result in I/O freeze
  ipr: set scsi_level correctly for disk arrays
  ipr: add support for async scanning to speed up boot
  scsi_debug: fix missing "break;" in SDEBUG_UA_CAPACITY_CHANGED case
  scsi_debug: take sdebug_host_list_lock when changing capacity
  scsi_debug: improve driver description in Kconfig
  scsi_debug: fix compare and write errors
  qla2xxx: fix race in handling rport deletion during recovery causes panic
  scsi: blacklist RSOC for Microsoft iSCSI target devices
  scsi: fix random memory corruption with scsi-mq + T10 PI
  Revert "[SCSI] mpt3sas: Remove phys on topology change"
  Revert "[SCSI] mpt2sas: Remove phys on topology change."
  esas2r: Correct typos of "validate" in a comment
  fc: FCP_PTA_SIMPLE is 0
  ibmvfc: remove unused tag variable
  scsi: remove MSG_*_TAG defines
  scsi: remove scsi_set_tag_type
  scsi: remove scsi_get_tag_type
  scsi: never drop to untagged mode during queue ramp down
  scsi: remove ->change_queue_type method

2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index db3c8c851af1..0747c0595a9d 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2740,7 +2740,6 @@ static struct scsi_host_template srp_template = {
         .info                           = srp_target_info,
         .queuecommand                   = srp_queuecommand,
         .change_queue_depth             = srp_change_queue_depth,
-        .change_queue_type              = scsi_change_queue_type,
         .eh_abort_handler               = srp_abort,
         .eh_device_reset_handler        = srp_reset_device,
         .eh_host_reset_handler          = srp_reset_host,
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index dc829682701a..eb694ddad79f 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1708,17 +1708,17 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
 
         switch (srp_cmd->task_attr) {
         case SRP_CMD_SIMPLE_Q:
-                cmd->sam_task_attr = MSG_SIMPLE_TAG;
+                cmd->sam_task_attr = TCM_SIMPLE_TAG;
                 break;
         case SRP_CMD_ORDERED_Q:
         default:
-                cmd->sam_task_attr = MSG_ORDERED_TAG;
+                cmd->sam_task_attr = TCM_ORDERED_TAG;
                 break;
         case SRP_CMD_HEAD_OF_Q:
-                cmd->sam_task_attr = MSG_HEAD_TAG;
+                cmd->sam_task_attr = TCM_HEAD_TAG;
                 break;
         case SRP_CMD_ACA:
-                cmd->sam_task_attr = MSG_ACA_TAG;
+                cmd->sam_task_attr = TCM_ACA_TAG;
                 break;
         }
 
@@ -1733,7 +1733,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
                                        sizeof(srp_cmd->lun));
         rc = target_submit_cmd(cmd, ch->sess, srp_cmd->cdb,
                         &send_ioctx->sense_data[0], unpacked_lun, data_len,
-                        MSG_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF);
+                        TCM_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF);
         if (rc != 0) {
                 ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                 goto send_sense;