Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68d81f40 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4e484896

drivers/infiniband/ulp/srpt/ib_srpt.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/advansys.c

+4 −4
Original line number Diff line number Diff line
@@ -7921,9 +7921,9 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, 
	 */

	if ((asc_dvc->cur_dvc_qng[scp->device->id] > 0) &&

	    (boardp->reqcnt[scp->device->id] % 255) == 0) {

		asc_scsi_q->q2.tag_code = MSG_ORDERED_TAG;

		asc_scsi_q->q2.tag_code = ORDERED_QUEUE_TAG;

	} else {

		asc_scsi_q->q2.tag_code = MSG_SIMPLE_TAG;

		asc_scsi_q->q2.tag_code = SIMPLE_QUEUE_TAG;

	}



	/* Build ASC_SCSI_Q */
@@ -8351,7 +8351,7 @@ static int AscPutReadyQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq, uchar q_no) 
	}

	q_addr = ASC_QNO_TO_QADDR(q_no);

	if ((scsiq->q1.target_id & asc_dvc->use_tagged_qng) == 0) {

		scsiq->q2.tag_code &= ~MSG_SIMPLE_TAG;

		scsiq->q2.tag_code &= ~SIMPLE_QUEUE_TAG;

	}

	scsiq->q1.status = QS_FREE;

	AscMemWordCopyPtrToLram(iop_base,
@@ -8669,7 +8669,7 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) 
		}

	}

	if (disable_syn_offset_one_fix) {

		scsiq->q2.tag_code &= ~MSG_SIMPLE_TAG;

		scsiq->q2.tag_code &= ~SIMPLE_QUEUE_TAG;

		scsiq->q2.tag_code |= (ASC_TAG_FLAG_DISABLE_ASYN_USE_SYN_FIX |

				       ASC_TAG_FLAG_DISABLE_DISCONNECT);

	} else {

drivers/scsi/qla2xxx/qla_target.c

+6 −6
Original line number Diff line number Diff line
@@ -3218,25 +3218,25 @@ static inline int qlt_get_fcp_task_attr(struct scsi_qla_host *vha, 


	switch (task_codes) {

	case ATIO_SIMPLE_QUEUE:

		fcp_task_attr = MSG_SIMPLE_TAG;

		fcp_task_attr = TCM_SIMPLE_TAG;

		break;

	case ATIO_HEAD_OF_QUEUE:

		fcp_task_attr = MSG_HEAD_TAG;

		fcp_task_attr = TCM_HEAD_TAG;

		break;

	case ATIO_ORDERED_QUEUE:

		fcp_task_attr = MSG_ORDERED_TAG;

		fcp_task_attr = TCM_ORDERED_TAG;

		break;

	case ATIO_ACA_QUEUE:

		fcp_task_attr = MSG_ACA_TAG;

		fcp_task_attr = TCM_ACA_TAG;

		break;

	case ATIO_UNTAGGED:

		fcp_task_attr = MSG_SIMPLE_TAG;

		fcp_task_attr = TCM_SIMPLE_TAG;

		break;

	default:

		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05d,

		    "qla_target: unknown task code %x, use ORDERED instead\n",

		    task_codes);

		fcp_task_attr = MSG_ORDERED_TAG;

		fcp_task_attr = TCM_ORDERED_TAG;

		break;

	}

drivers/scsi/scsi_debug.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static const char *scsi_debug_version_date = "20141022"; 
#define DEF_REMOVABLE false

#define DEF_SCSI_LEVEL   6    /* INQUIRY, byte2 [6->SPC-4] */

#define DEF_SECTOR_SIZE 512

#define DEF_TAGGED_QUEUING 0 /* 0 | MSG_SIMPLE_TAG | MSG_ORDERED_TAG */

#define DEF_UNMAP_ALIGNMENT 0

#define DEF_UNMAP_GRANULARITY 1

#define DEF_UNMAP_MAX_BLOCKS 0xFFFFFFFF

drivers/scsi/scsi_transport_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ EXPORT_SYMBOL_GPL(spi_populate_ppr_msg); 
int spi_populate_tag_msg(unsigned char *msg, struct scsi_cmnd *cmd)

{

        if (cmd->flags & SCMD_TAGGED) {

		*msg++ = MSG_SIMPLE_TAG;

		*msg++ = SIMPLE_QUEUE_TAG;

        	*msg++ = cmd->request->tag;

        	return 2;

	}