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

Commit eb846d9f authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16 



SPC-3 defines SERVICE ACTION IN(12) and SERVICE ACTION IN(16).
So rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16 to be
consistent with SPC and to allow for better distinction.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarRobert Elliott <elliott@hp.com>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3af6b352

block/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter) 
	__set_bit(GPCMD_VERIFY_10, filter->read_ok);

	__set_bit(VERIFY_16, filter->read_ok);

	__set_bit(REPORT_LUNS, filter->read_ok);

	__set_bit(SERVICE_ACTION_IN, filter->read_ok);

	__set_bit(SERVICE_ACTION_IN_16, filter->read_ok);

	__set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok);

	__set_bit(MAINTENANCE_IN, filter->read_ok);

	__set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok);

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3570,7 +3570,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
		ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);

		break;



	case SERVICE_ACTION_IN:

	case SERVICE_ACTION_IN_16:

		if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16)

			ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);

		else

drivers/block/nvme-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ INQUIRY_EVPD_BIT_MASK) ? 1 : 0) 
(GET_U32_FROM_CDB(cdb, READ_CAP_16_CDB_ALLOC_LENGTH_OFFSET))



#define IS_READ_CAP_16(cdb)					\

((cdb[0] == SERVICE_ACTION_IN && cdb[1] == SAI_READ_CAPACITY_16) ? 1 : 0)

((cdb[0] == SERVICE_ACTION_IN_16 && cdb[1] == SAI_READ_CAPACITY_16) ? 1 : 0)



/* Request Sense Helper Macros */

#define GET_REQUEST_SENSE_ALLOC_LENGTH(cdb)			\
@@ -2947,7 +2947,7 @@ static int nvme_scsi_translate(struct nvme_ns *ns, struct sg_io_hdr *hdr) 
	case READ_CAPACITY:

		retcode = nvme_trans_read_capacity(ns, hdr, cmd);

		break;

	case SERVICE_ACTION_IN:

	case SERVICE_ACTION_IN_16:

		if (IS_READ_CAP_16(cmd))

			retcode = nvme_trans_read_capacity(ns, hdr, cmd);

		else

drivers/scsi/aacraid/aachba.c

+2 −2
Original line number Diff line number Diff line
@@ -2181,7 +2181,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) 
			  (fsa_dev_ptr[cid].sense_data.sense_key ==

			   NOT_READY)) {

				switch (scsicmd->cmnd[0]) {

				case SERVICE_ACTION_IN:

				case SERVICE_ACTION_IN_16:

					if (!(dev->raw_io_interface) ||

					    !(dev->raw_io_64) ||

					    ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
@@ -2309,7 +2309,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) 
		scsi_sg_copy_from_buffer(scsicmd, &inq_data, sizeof(inq_data));

		return aac_get_container_name(scsicmd);

	}

	case SERVICE_ACTION_IN:

	case SERVICE_ACTION_IN_16:

		if (!(dev->raw_io_interface) ||

		    !(dev->raw_io_64) ||

		    ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))

drivers/scsi/aacraid/linit.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd) 
		AAC_DRIVERNAME,

		host->host_no, sdev_channel(dev), sdev_id(dev), dev->lun);

	switch (cmd->cmnd[0]) {

	case SERVICE_ACTION_IN:

	case SERVICE_ACTION_IN_16:

		if (!(aac->raw_io_interface) ||

		    !(aac->raw_io_64) ||

		    ((cmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))