scsi: remove MSG_*_TAG defines

For SPI drivers use the message definitions from scsi.h, and for target
drivers introduce a new TCM_*_TAG namespace.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 7206547..3a0ca61 100644 (file)
--- 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;

diff --cc drivers/scsi/advansys.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc drivers/scsi/scsi_transport_spi.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/loopback/tcm_loop.c
Simple merge

diff --cc drivers/target/sbp/sbp_target.c
Simple merge

diff --cc drivers/target/target_core_pscsi.c
Simple merge

diff --cc drivers/target/target_core_sbc.c
Simple merge

diff --cc drivers/target/target_core_spc.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/usb/gadget/legacy/tcm_usb_gadget.c
Simple merge

diff --cc drivers/xen/xen-scsiback.c
Simple merge

diff --cc include/scsi/scsi_tcq.h
Simple merge

diff --cc include/target/target_core_base.h
Simple merge

diff --cc include/trace/events/target.h
Simple merge