tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Hannes Reinecke <hare@suse.de>
Tested-by: Robert Elliott <elliott@hp.com>
Reviewed-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Hannes Reinecke and committed by
Christoph Hellwig eb846d9f 3af6b352

+20 -21
+1 -1
block/scsi_ioctl.c
··· 142 142 __set_bit(GPCMD_VERIFY_10, filter->read_ok); 143 143 __set_bit(VERIFY_16, filter->read_ok); 144 144 __set_bit(REPORT_LUNS, filter->read_ok); 145 - __set_bit(SERVICE_ACTION_IN, filter->read_ok); 145 + __set_bit(SERVICE_ACTION_IN_16, filter->read_ok); 146 146 __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok); 147 147 __set_bit(MAINTENANCE_IN, filter->read_ok); 148 148 __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok);
+1 -1
drivers/ata/libata-scsi.c
··· 3570 3570 ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap); 3571 3571 break; 3572 3572 3573 - case SERVICE_ACTION_IN: 3573 + case SERVICE_ACTION_IN_16: 3574 3574 if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16) 3575 3575 ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap); 3576 3576 else
+2 -2
drivers/block/nvme-scsi.c
··· 329 329 (GET_U32_FROM_CDB(cdb, READ_CAP_16_CDB_ALLOC_LENGTH_OFFSET)) 330 330 331 331 #define IS_READ_CAP_16(cdb) \ 332 - ((cdb[0] == SERVICE_ACTION_IN && cdb[1] == SAI_READ_CAPACITY_16) ? 1 : 0) 332 + ((cdb[0] == SERVICE_ACTION_IN_16 && cdb[1] == SAI_READ_CAPACITY_16) ? 1 : 0) 333 333 334 334 /* Request Sense Helper Macros */ 335 335 #define GET_REQUEST_SENSE_ALLOC_LENGTH(cdb) \ ··· 2947 2947 case READ_CAPACITY: 2948 2948 retcode = nvme_trans_read_capacity(ns, hdr, cmd); 2949 2949 break; 2950 - case SERVICE_ACTION_IN: 2950 + case SERVICE_ACTION_IN_16: 2951 2951 if (IS_READ_CAP_16(cmd)) 2952 2952 retcode = nvme_trans_read_capacity(ns, hdr, cmd); 2953 2953 else
+2 -2
drivers/scsi/aacraid/aachba.c
··· 2181 2181 (fsa_dev_ptr[cid].sense_data.sense_key == 2182 2182 NOT_READY)) { 2183 2183 switch (scsicmd->cmnd[0]) { 2184 - case SERVICE_ACTION_IN: 2184 + case SERVICE_ACTION_IN_16: 2185 2185 if (!(dev->raw_io_interface) || 2186 2186 !(dev->raw_io_64) || 2187 2187 ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16)) ··· 2309 2309 scsi_sg_copy_from_buffer(scsicmd, &inq_data, sizeof(inq_data)); 2310 2310 return aac_get_container_name(scsicmd); 2311 2311 } 2312 - case SERVICE_ACTION_IN: 2312 + case SERVICE_ACTION_IN_16: 2313 2313 if (!(dev->raw_io_interface) || 2314 2314 !(dev->raw_io_64) || 2315 2315 ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
+1 -1
drivers/scsi/aacraid/linit.c
··· 555 555 AAC_DRIVERNAME, 556 556 host->host_no, sdev_channel(dev), sdev_id(dev), dev->lun); 557 557 switch (cmd->cmnd[0]) { 558 - case SERVICE_ACTION_IN: 558 + case SERVICE_ACTION_IN_16: 559 559 if (!(aac->raw_io_interface) || 560 560 !(aac->raw_io_64) || 561 561 ((cmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
-1
drivers/scsi/constants.c
··· 24 24 #define SERVICE_ACTION_IN_12 0xab 25 25 #define SERVICE_ACTION_OUT_12 0xa9 26 26 #define SERVICE_ACTION_BIDIRECTIONAL 0x9d 27 - #define SERVICE_ACTION_IN_16 0x9e 28 27 #define SERVICE_ACTION_OUT_16 0x9f 29 28 #define THIRD_PARTY_COPY_OUT 0x83 30 29 #define THIRD_PARTY_COPY_IN 0x84
+2 -2
drivers/scsi/gdth.c
··· 2159 2159 case VERIFY: 2160 2160 case START_STOP: 2161 2161 case MODE_SENSE: 2162 - case SERVICE_ACTION_IN: 2162 + case SERVICE_ACTION_IN_16: 2163 2163 TRACE(("cache cmd %x/%x/%x/%x/%x/%x\n",nscp->cmnd[0], 2164 2164 nscp->cmnd[1],nscp->cmnd[2],nscp->cmnd[3], 2165 2165 nscp->cmnd[4],nscp->cmnd[5])); ··· 2391 2391 gdth_copy_internal_data(ha, scp, (char*)&rdc, sizeof(gdth_rdcap_data)); 2392 2392 break; 2393 2393 2394 - case SERVICE_ACTION_IN: 2394 + case SERVICE_ACTION_IN_16: 2395 2395 if ((scp->cmnd[1] & 0x1f) == SAI_READ_CAPACITY_16 && 2396 2396 (ha->cache_feat & GDT_64BIT)) { 2397 2397 gdth_rdcap16_data rdc16;
+1 -1
drivers/scsi/scsi_debug.c
··· 4210 4210 case READ_CAPACITY: 4211 4211 errsts = resp_readcap(SCpnt, devip); 4212 4212 break; 4213 - case SERVICE_ACTION_IN: 4213 + case SERVICE_ACTION_IN_16: 4214 4214 if (cmd[1] == SAI_READ_CAPACITY_16) 4215 4215 errsts = resp_readcap16(SCpnt, devip); 4216 4216 else if (cmd[1] == SAI_GET_LBA_STATUS) {
+1 -1
drivers/scsi/scsi_trace.c
··· 278 278 return scsi_trace_rw16(p, cdb, len); 279 279 case UNMAP: 280 280 return scsi_trace_unmap(p, cdb, len); 281 - case SERVICE_ACTION_IN: 281 + case SERVICE_ACTION_IN_16: 282 282 return scsi_trace_service_action_in(p, cdb, len); 283 283 case VARIABLE_LENGTH_CMD: 284 284 return scsi_trace_varlen(p, cdb, len);
+1 -1
drivers/scsi/sd.c
··· 1982 1982 1983 1983 do { 1984 1984 memset(cmd, 0, 16); 1985 - cmd[0] = SERVICE_ACTION_IN; 1985 + cmd[0] = SERVICE_ACTION_IN_16; 1986 1986 cmd[1] = SAI_READ_CAPACITY_16; 1987 1987 cmd[13] = RC16_LEN; 1988 1988 memset(buffer, 0, RC16_LEN);
+1 -1
drivers/target/target_core_alua.c
··· 576 576 case SEND_DIAGNOSTIC: 577 577 case READ_CAPACITY: 578 578 return 0; 579 - case SERVICE_ACTION_IN: 579 + case SERVICE_ACTION_IN_16: 580 580 switch (cdb[1] & 0x1f) { 581 581 case SAI_READ_CAPACITY_16: 582 582 return 0;
+1 -1
drivers/target/target_core_sbc.c
··· 852 852 size = READ_CAP_LEN; 853 853 cmd->execute_cmd = sbc_emulate_readcapacity; 854 854 break; 855 - case SERVICE_ACTION_IN: 855 + case SERVICE_ACTION_IN_16: 856 856 switch (cmd->t_task_cdb[1] & 0x1f) { 857 857 case SAI_READ_CAPACITY_16: 858 858 cmd->execute_cmd = sbc_emulate_readcapacity_16;
+1 -1
drivers/usb/gadget/legacy/tcm_usb_gadget.c
··· 912 912 case INQUIRY: 913 913 case MODE_SENSE: 914 914 case MODE_SENSE_10: 915 - case SERVICE_ACTION_IN: 915 + case SERVICE_ACTION_IN_16: 916 916 case MAINTENANCE_IN: 917 917 case PERSISTENT_RESERVE_IN: 918 918 case SECURITY_PROTOCOL_IN:
+1 -1
include/scsi/scsi.h
··· 151 151 #define VERIFY_16 0x8f 152 152 #define SYNCHRONIZE_CACHE_16 0x91 153 153 #define WRITE_SAME_16 0x93 154 - #define SERVICE_ACTION_IN 0x9e 154 + #define SERVICE_ACTION_IN_16 0x9e 155 155 /* values for service action in */ 156 156 #define SAI_READ_CAPACITY_16 0x10 157 157 #define SAI_GET_LBA_STATUS 0x12
+1 -1
include/trace/events/scsi.h
··· 94 94 scsi_opcode_name(WRITE_16), \ 95 95 scsi_opcode_name(VERIFY_16), \ 96 96 scsi_opcode_name(WRITE_SAME_16), \ 97 - scsi_opcode_name(SERVICE_ACTION_IN), \ 97 + scsi_opcode_name(SERVICE_ACTION_IN_16), \ 98 98 scsi_opcode_name(SAI_READ_CAPACITY_16), \ 99 99 scsi_opcode_name(SAI_GET_LBA_STATUS), \ 100 100 scsi_opcode_name(MI_REPORT_TARGET_PGS), \
+1 -1
include/trace/events/target.h
··· 96 96 scsi_opcode_name(WRITE_16), \ 97 97 scsi_opcode_name(VERIFY_16), \ 98 98 scsi_opcode_name(WRITE_SAME_16), \ 99 - scsi_opcode_name(SERVICE_ACTION_IN), \ 99 + scsi_opcode_name(SERVICE_ACTION_IN_16), \ 100 100 scsi_opcode_name(SAI_READ_CAPACITY_16), \ 101 101 scsi_opcode_name(SAI_GET_LBA_STATUS), \ 102 102 scsi_opcode_name(MI_REPORT_TARGET_PGS), \
+2 -2
tools/lib/traceevent/plugin_scsi.c
··· 107 107 #define VERIFY_16 0x8f 108 108 #define SYNCHRONIZE_CACHE_16 0x91 109 109 #define WRITE_SAME_16 0x93 110 - #define SERVICE_ACTION_IN 0x9e 110 + #define SERVICE_ACTION_IN_16 0x9e 111 111 /* values for service action in */ 112 112 #define SAI_READ_CAPACITY_16 0x10 113 113 #define SAI_GET_LBA_STATUS 0x12 ··· 393 393 return scsi_trace_rw16(p, cdb, len); 394 394 case UNMAP: 395 395 return scsi_trace_unmap(p, cdb, len); 396 - case SERVICE_ACTION_IN: 396 + case SERVICE_ACTION_IN_16: 397 397 return scsi_trace_service_action_in(p, cdb, len); 398 398 case VARIABLE_LENGTH_CMD: 399 399 return scsi_trace_varlen(p, cdb, len);