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

5 files changed, 10 insertions, 54 deletions

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 9d87a37aecad..dae99d7d2bc0 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -688,7 +688,6 @@ extern int sas_queuecommand(struct Scsi_Host * ,struct scsi_cmnd *);
 extern int sas_target_alloc(struct scsi_target *);
 extern int sas_slave_configure(struct scsi_device *);
 extern int sas_change_queue_depth(struct scsi_device *, int new_depth);
-extern int sas_change_queue_type(struct scsi_device *, int qt);
 extern int sas_bios_param(struct scsi_device *,
                           struct block_device *,
                           sector_t capacity, int *hsc);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index e939d2b3757a..019e66858ce6 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -278,19 +278,6 @@ struct scsi_host_template {
         int (* change_queue_depth)(struct scsi_device *, int);
 
         /*
-         * Fill in this function to allow the changing of tag types
-         * (this also allows the enabling/disabling of tag command
-         * queueing).  An error should only be returned if something
-         * went wrong in the driver while trying to set the tag type.
-         * If the driver doesn't support the requested tag type, then
-         * it should set the closest type it does support without
-         * returning an error.  Returns the actual tag type set.
-         *
-         * Status: OPTIONAL
-         */
-        int (* change_queue_type)(struct scsi_device *, int);
-
-        /*
          * This function determines the BIOS parameters for a given
          * harddisk.  These tend to be numbers that are made up by
          * the host adapter.  Parameters:
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index fe4a70299419..9708b28bd2aa 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -6,46 +6,10 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 
-#define MSG_SIMPLE_TAG  0x20
-#define MSG_HEAD_TAG    0x21
-#define MSG_ORDERED_TAG 0x22
-#define MSG_ACA_TAG     0x24    /* unsupported */
-
 #define SCSI_NO_TAG     (-1)    /* identify no tag in use */
 
 
 #ifdef CONFIG_BLOCK
-
-int scsi_change_queue_type(struct scsi_device *sdev, int tag_type);
-
-/**
- * scsi_get_tag_type - get the type of tag the device supports
- * @sdev:       the scsi device
- */
-static inline int scsi_get_tag_type(struct scsi_device *sdev)
-{
-        if (!sdev->tagged_supported)
-                return 0;
-        if (sdev->simple_tags)
-                return MSG_SIMPLE_TAG;
-        return 0;
-}
-
-static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag)
-{
-        switch (tag) {
-        case MSG_ORDERED_TAG:
-        case MSG_SIMPLE_TAG:
-                sdev->simple_tags = 1;
-                break;
-        case 0:
-                /* fall through */
-        default:
-                sdev->simple_tags = 0;
-                break;
-        }
-}
-
 static inline struct scsi_cmnd *scsi_mq_find_tag(struct Scsi_Host *shost,
                                                  int unique_tag)
 {
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 23c518a0340c..397fb635766a 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -476,6 +476,12 @@ struct se_dif_v1_tuple {
         __be32                  ref_tag;
 };
 
+/* for sam_task_attr */
+#define TCM_SIMPLE_TAG  0x20
+#define TCM_HEAD_TAG    0x21
+#define TCM_ORDERED_TAG 0x22
+#define TCM_ACA_TAG     0x24
+
 struct se_cmd {
         /* SAM response code being sent to initiator */
         u8                      scsi_status;
diff --git a/include/trace/events/target.h b/include/trace/events/target.h
index 45403443dd82..04c3c6efdcc2 100644
--- a/include/trace/events/target.h
+++ b/include/trace/events/target.h
@@ -109,10 +109,10 @@
 
 #define show_task_attribute_name(val)                           \
         __print_symbolic(val,                                   \
-                { MSG_SIMPLE_TAG,       "SIMPLE"        },      \
-                { MSG_HEAD_TAG,         "HEAD"          },      \
-                { MSG_ORDERED_TAG,      "ORDERED"       },      \
-                { MSG_ACA_TAG,          "ACA"           } )
+                { TCM_SIMPLE_TAG,       "SIMPLE"        },      \
+                { TCM_HEAD_TAG,         "HEAD"          },      \
+                { TCM_ORDERED_TAG,      "ORDERED"       },      \
+                { TCM_ACA_TAG,          "ACA"           } )
 
 #define show_scsi_status_name(val)                              \
         __print_symbolic(val,                                   \