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

Commit 609aa22f authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove ordered_tags scsi_device field 



Remove the ordered_tags field, we haven't been issuing ordered tags based
on it since the big barrier rework in 2010.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 125c99bc

drivers/message/fusion/mptscsih.c

+2 −3
Original line number Diff line number Diff line
@@ -2400,9 +2400,8 @@ mptscsih_slave_configure(struct scsi_device *sdev) 
	mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH,

				    SCSI_QDEPTH_DEFAULT);

	dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		"tagged %d, simple %d, ordered %d\n",

		ioc->name,sdev->tagged_supported, sdev->simple_tags,

		sdev->ordered_tags));

		"tagged %d, simple %d\n",

		ioc->name,sdev->tagged_supported, sdev->simple_tags));



	blk_queue_dma_alignment (sdev->request_queue, 512 - 1);

drivers/scsi/bfa/bfad_im.c

+3 −8
Original line number Diff line number Diff line
@@ -868,11 +868,6 @@ bfad_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct scsi_device *sdev) 
			if (bfa_lun_queue_depth > tmp_sdev->queue_depth) {

				if (tmp_sdev->id != sdev->id)

					continue;

				if (tmp_sdev->ordered_tags)

					scsi_adjust_queue_depth(tmp_sdev,

						MSG_ORDERED_TAG,

						tmp_sdev->queue_depth + 1);

				else

				scsi_adjust_queue_depth(tmp_sdev,

					MSG_SIMPLE_TAG,

					tmp_sdev->queue_depth + 1);

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+4 −12
Original line number Diff line number Diff line
@@ -1246,9 +1246,9 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) 


	if (sdev->inquiry_len > 7)

		sdev_printk(KERN_INFO, sdev, "qdepth(%d), tagged(%d), "

		"simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n",

		"simple(%d), scsi_level(%d), cmd_que(%d)\n",

		sdev->queue_depth, sdev->tagged_supported, sdev->simple_tags,

		sdev->ordered_tags, sdev->scsi_level,

		sdev->scsi_level,

		(sdev->inquiry[7] & 2) >> 1);



	return sdev->queue_depth;
@@ -3944,16 +3944,8 @@ _scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd) 
		mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;



	/* set tags */

	if (!(sas_device_priv_data->flags & MPT_DEVICE_FLAGS_INIT)) {

		if (scmd->device->tagged_supported) {

			if (scmd->device->ordered_tags)

				mpi_control |= MPI2_SCSIIO_CONTROL_ORDEREDQ;

			else

				mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;

		} else

			mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;

	} else

	mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;



	/* Make sure Device is not raid volume.

	 * We do not expose raid functionality to upper layer for warpdrive.

	 */

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+3 −12
Original line number Diff line number Diff line
@@ -1114,9 +1114,9 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) 


	if (sdev->inquiry_len > 7)

		sdev_printk(KERN_INFO, sdev, "qdepth(%d), tagged(%d), " \

		"simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n",

		"simple(%d), scsi_level(%d), cmd_que(%d)\n",

		sdev->queue_depth, sdev->tagged_supported, sdev->simple_tags,

		sdev->ordered_tags, sdev->scsi_level,

		sdev->scsi_level,

		(sdev->inquiry[7] & 2) >> 1);



	return sdev->queue_depth;
@@ -3563,15 +3563,6 @@ _scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd) 
		mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;



	/* set tags */

	if (!(sas_device_priv_data->flags & MPT_DEVICE_FLAGS_INIT)) {

		if (scmd->device->tagged_supported) {

			if (scmd->device->ordered_tags)

				mpi_control |= MPI2_SCSIIO_CONTROL_ORDEREDQ;

			else

				mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;

		} else

			mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;

	} else

	mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;



	if ((sas_device_priv_data->flags & MPT_DEVICE_TLR_ON) &&

drivers/scsi/qla2xxx/qla_os.c

+1 −4
Original line number Diff line number Diff line
@@ -1442,9 +1442,6 @@ static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth) 
	if (req->max_q_depth <= sdev->queue_depth || req->max_q_depth < qdepth)

		return;



	if (sdev->ordered_tags)

		scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, qdepth);

	else

	scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, qdepth);



	ql_dbg(ql_dbg_io, vha, 0x302a,