scsi, usb: Rename the RESERVE and RELEASE constants
Subsystems (11)
PATCH 1/1 scsi, usb: Rename the RESERVE and RELEASE constants
The names RESERVE and RELEASE are not only used in <scsi/scsi_proto.h> but also elsewhere in the kernel:
$ git grep -nHE 'define[[:blank:]]*(RESERVE|RELEASE)[[:blank:]]' drivers/input/joystick/walkera0701.c:13:#define RESERVE 20000 drivers/s390/char/tape_std.h:56:#define RELEASE 0xD4 /* 3420 NOP, 3480 REJECT */ drivers/s390/char/tape_std.h:58:#define RESERVE 0xF4 /* 3420 NOP, 3480 REJECT */
Additionally, while the names of the symbolic constants RESERVE_10 and RELEASE_10 include the command length, the command length is not included in the RESERVE and RELEASE names. Address both issues by renaming the RESERVE and RELEASE constants into RESERVE_6 and RELEASE_6 respectively.
--- drivers/message/fusion/mptscsih.c | 4 ++-- drivers/scsi/aacraid/aachba.c | 4 ++-- drivers/scsi/arm/acornscsi.c | 2 +- drivers/scsi/ips.c | 8 ++++---- drivers/scsi/megaraid.c | 10 +++++----- drivers/scsi/megaraid/megaraid_mbox.c | 10 +++++----- drivers/target/target_core_device.c | 8 ++++---- drivers/target/target_core_pr.c | 6 +++--- drivers/target/target_core_spc.c | 20 ++++++++++---------- drivers/usb/gadget/function/f_mass_storage.c | 4 ++-- drivers/usb/storage/debug.c | 4 ++-- include/scsi/scsi_proto.h | 4 ++-- include/trace/events/scsi.h | 4 ++-- include/trace/events/target.h | 4 ++-- 14 files changed, 46 insertions(+), 46 deletions(-)
drivers/message/fusion/mptscsih.c +2 -2
@@ -2856,14 +2856,14 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io) timeout =10 ;break ; -case RESERVE : +case RESERVE_6 : cmdLen =6 ; dir =MPI_SCSIIO_CONTROL_READ ;CDB [0 ] = cmd; timeout =10 ;break ; -case RELEASE : +case RELEASE_6 : cmdLen =6 ; dir =MPI_SCSIIO_CONTROL_READ ;CDB [0 ] = cmd;
drivers/scsi/aacraid/aachba.c +2 -2
@@ -3221,8 +3221,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)break ; } fallthrough; -case RESERVE : -case RELEASE : +case RESERVE_6 : +case RELEASE_6 :case REZERO_UNIT :case REASSIGN_BLOCKS :case SEEK_10 :
drivers/scsi/arm/acornscsi.c +1 -1
@@ -591,7 +591,7 @@ datadir_t acornscsi_datadirection(int command)case CHANGE_DEFINITION :case COMPARE :case COPY :case COPY_VERIFY :case LOG_SELECT :case MODE_SELECT :case MODE_SELECT_10 :case SEND_DIAGNOSTIC :case WRITE_BUFFER : -case FORMAT_UNIT :case REASSIGN_BLOCKS :case RESERVE : +case FORMAT_UNIT :case REASSIGN_BLOCKS :case RESERVE_6 :case SEARCH_EQUAL :case SEARCH_HIGH :case SEARCH_LOW :case WRITE_6 :case WRITE_10 :case WRITE_VERIFY :case UPDATE_BLOCK :case WRITE_LONG :case WRITE_SAME :
drivers/scsi/ips.c +4 -4
@@ -3631,8 +3631,8 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)break ; -case RESERVE : -case RELEASE : +case RESERVE_6 : +case RELEASE_6 : scb->scsi_cmd->result =DID_OK <<16 ;break ;
@@ -3899,8 +3899,8 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)case WRITE_6 :case READ_10 :case WRITE_10 : -case RESERVE : -case RELEASE : +case RESERVE_6 : +case RELEASE_6 :break ;case MODE_SENSE :
drivers/scsi/megaraid.c +5 -5
@@ -855,8 +855,8 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy)return scb;#if MEGA_HAVE_CLUSTERING -case RESERVE : -case RELEASE : +case RESERVE_6 : +case RELEASE_6 :/* * Do we support clustering and is the support enabled
@@ -875,7 +875,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) } scb->raw_mbox[0 ] =MEGA_CLUSTER_CMD ; - scb->raw_mbox[2 ] = ( *cmd->cmnd ==RESERVE ) ? + scb->raw_mbox[2 ] = *cmd->cmnd ==RESERVE_6 ?MEGA_RESERVE_LD :MEGA_RELEASE_LD ; scb->raw_mbox[3 ] = ldrv_num;
@@ -1618,8 +1618,8 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)* failed or the input parameter is invalid */ if ( status ==1 && - (cmd->cmnd[0 ] ==RESERVE || - cmd->cmnd[0 ] ==RELEASE ) ) { + (cmd->cmnd[0 ] ==RESERVE_6 || + cmd->cmnd[0 ] ==RELEASE_6 ) ) { cmd->result |= (DID_ERROR <<16 ) |SAM_STAT_RESERVATION_CONFLICT ;
drivers/scsi/megaraid/megaraid_mbox.c +5 -5
@@ -1725,8 +1725,8 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)return scb; -case RESERVE : -case RELEASE : +case RESERVE_6 : +case RELEASE_6 :/* * Do we support clustering and is the support enabled */
@@ -1748,7 +1748,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) scb->dev_channel =0xFF ; scb->dev_target = target; ccb->raw_mbox[0 ] =CLUSTER_CMD ; - ccb->raw_mbox[2 ] = (scp->cmnd[0 ] ==RESERVE ) ? + ccb->raw_mbox[2 ] = scp->cmnd[0 ] ==RESERVE_6 ?RESERVE_LD :RELEASE_LD ; ccb->raw_mbox[3 ] = target;
@@ -2334,8 +2334,8 @@ megaraid_mbox_dpc(unsigned long devp)* Error code returned is 1 if Reserve or Release * failed or the input parameter is invalid */ -if (status ==1 && (scp->cmnd[0 ] ==RESERVE || - scp->cmnd[0 ] ==RELEASE )) { +if (status ==1 && (scp->cmnd[0 ] ==RESERVE_6 || + scp->cmnd[0 ] ==RELEASE_6 )) { scp->result =DID_ERROR <<16 |SAM_STAT_RESERVATION_CONFLICT ;
drivers/target/target_core_device.c +4 -4
@@ -1078,8 +1078,8 @@ passthrough_parse_cdb(struct se_cmd *cmd,if (!dev->dev_attrib.emulate_pr && ((cdb[0 ] ==PERSISTENT_RESERVE_IN ) || (cdb[0 ] ==PERSISTENT_RESERVE_OUT ) || - (cdb[0 ] ==RELEASE || cdb[0 ] ==RELEASE_10 ) || - (cdb[0 ] ==RESERVE || cdb[0 ] ==RESERVE_10 ))) { + (cdb[0 ] ==RELEASE_6 || cdb[0 ] ==RELEASE_10 ) || + (cdb[0 ] ==RESERVE_6 || cdb[0 ] ==RESERVE_10 ))) {return TCM_UNSUPPORTED_SCSI_OPCODE ; }
@@ -1101,7 +1101,7 @@ passthrough_parse_cdb(struct se_cmd *cmd,return target_cmd_size_check (cmd, size); } -if (cdb[0 ] ==RELEASE || cdb[0 ] ==RELEASE_10 ) { +if (cdb[0 ] ==RELEASE_6 || cdb[0 ] ==RELEASE_10 ) { cmd->execute_cmd = target_scsi2_reservation_release;if (cdb[0 ] ==RELEASE_10 ) size =get_unaligned_be16 (&cdb[7 ]);
@@ -1109,7 +1109,7 @@ passthrough_parse_cdb(struct se_cmd *cmd, size = cmd->data_length;return target_cmd_size_check (cmd, size); } -if (cdb[0 ] ==RESERVE || cdb[0 ] ==RESERVE_10 ) { +if (cdb[0 ] ==RESERVE_6 || cdb[0 ] ==RESERVE_10 ) { cmd->execute_cmd = target_scsi2_reservation_reserve;if (cdb[0 ] ==RESERVE_10 ) size =get_unaligned_be16 (&cdb[7 ]);
drivers/target/target_core_pr.c +3 -3
@@ -91,7 +91,7 @@ target_scsi2_reservation_check(struct se_cmd *cmd)switch (cmd->t_task_cdb[0 ]) {case INQUIRY : -case RELEASE : +case RELEASE_6 :case RELEASE_10 :return 0 ;default :
@@ -418,12 +418,12 @@ static int core_scsi3_pr_seq_non_holder(struct se_cmd *cmd, u32 pr_reg_type,return -EINVAL ; }break ; -case RELEASE : +case RELEASE_6 :case RELEASE_10 :/* Handled by CRH=1 in target_scsi2_reservation_release() */ ret =0 ;break ; -case RESERVE : +case RESERVE_6 :case RESERVE_10 :/* Handled by CRH=1 in target_scsi2_reservation_reserve() */ ret =0 ;
drivers/target/target_core_spc.c +10 -10
@@ -1674,9 +1674,9 @@ static bool tcm_is_pr_enabled(struct target_opcode_descriptor *descr,return true;switch (descr->opcode) { -case RESERVE : +case RESERVE_6 :case RESERVE_10 : -case RELEASE : +case RELEASE_6 :case RELEASE_10 :/* * The pr_ops which are used by the backend modules don't
@@ -1828,9 +1828,9 @@ static struct target_opcode_descriptor tcm_opcode_pro_register_move = {static struct target_opcode_descriptor tcm_opcode_release = { .support =SCSI_SUPPORT_FULL , - .opcode =RELEASE , + .opcode =RELEASE_6 , .cdb_size =6 , - .usage_bits = {RELEASE ,0x00 ,0x00 ,0x00 , + .usage_bits = {RELEASE_6 ,0x00 ,0x00 ,0x00 ,0x00 ,SCSI_CONTROL_MASK }, .enabled = tcm_is_pr_enabled, };
@@ -1847,9 +1847,9 @@ static struct target_opcode_descriptor tcm_opcode_release10 = {static struct target_opcode_descriptor tcm_opcode_reserve = { .support =SCSI_SUPPORT_FULL , - .opcode =RESERVE , + .opcode =RESERVE_6 , .cdb_size =6 , - .usage_bits = {RESERVE ,0x00 ,0x00 ,0x00 , + .usage_bits = {RESERVE_6 ,0x00 ,0x00 ,0x00 ,0x00 ,SCSI_CONTROL_MASK }, .enabled = tcm_is_pr_enabled, };
@@ -2267,9 +2267,9 @@ spc_parse_cdb(struct se_cmd *cmd, unsigned int *size)unsigned char *cdb = cmd->t_task_cdb;switch (cdb[0 ]) { -case RESERVE : +case RESERVE_6 :case RESERVE_10 : -case RELEASE : +case RELEASE_6 :case RELEASE_10 :if (!dev->dev_attrib.emulate_pr)return TCM_UNSUPPORTED_SCSI_OPCODE ;
@@ -2313,7 +2313,7 @@ spc_parse_cdb(struct se_cmd *cmd, unsigned int *size) *size =get_unaligned_be32 (&cdb[5 ]); cmd->execute_cmd = target_scsi3_emulate_pr_out;break ; -case RELEASE : +case RELEASE_6 :case RELEASE_10 :if (cdb[0 ] ==RELEASE_10 ) *size =get_unaligned_be16 (&cdb[7 ]);
@@ -2322,7 +2322,7 @@ spc_parse_cdb(struct se_cmd *cmd, unsigned int *size) cmd->execute_cmd = target_scsi2_reservation_release;break ; -case RESERVE : +case RESERVE_6 :case RESERVE_10 :/* * The SPC-2 RESERVE does not contain a size in the SCSI CDB.
drivers/usb/gadget/function/f_mass_storage.c +2 -2
@@ -2142,8 +2142,8 @@ static int do_scsi_command(struct fsg_common *common)* of Posix locks. */ case FORMAT_UNIT : -case RELEASE : -case RESERVE : +case RELEASE_6 : +case RESERVE_6 :case SEND_DIAGNOSTIC :default :
drivers/usb/storage/debug.c +2 -2
@@ -58,8 +58,8 @@ void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb)case INQUIRY : what ="INQUIRY" ;break ;case RECOVER_BUFFERED_DATA : what ="RECOVER_BUFFERED_DATA" ;break ;case MODE_SELECT : what ="MODE_SELECT" ;break ; -case RESERVE : what ="RESERVE" ;break ; -case RELEASE : what ="RELEASE" ;break ; +case RESERVE_6 : what ="RESERVE" ;break ; +case RELEASE_6 : what ="RELEASE" ;break ;case COPY : what ="COPY" ;break ;case ERASE : what ="ERASE" ;break ;case MODE_SENSE : what ="MODE_SENSE" ;break ;
include/scsi/scsi_proto.h +2 -2
@@ -33,8 +33,8 @@#define INQUIRY 0x12#define RECOVER_BUFFERED_DATA 0x14#define MODE_SELECT 0x15 -#define RESERVE 0x16 -#define RELEASE 0x17 +#define RESERVE_6 0x16 +#define RELEASE_6 0x17#define COPY 0x18#define ERASE 0x19#define MODE_SENSE 0x1a
include/trace/events/scsi.h +2 -2
@@ -29,8 +29,8 @@scsi_opcode_name (INQUIRY ), \scsi_opcode_name (RECOVER_BUFFERED_DATA ), \scsi_opcode_name (MODE_SELECT ), \ -scsi_opcode_name (RESERVE ), \ -scsi_opcode_name (RELEASE ), \ +scsi_opcode_name (RESERVE_6 ), \ +scsi_opcode_name (RELEASE_6 ), \scsi_opcode_name (COPY ), \scsi_opcode_name (ERASE ), \ scsi_opcode_name(MODE_SENSE), \
include/trace/events/target.h +2 -2
@@ -31,8 +31,8 @@scsi_opcode_name (INQUIRY ), \scsi_opcode_name (RECOVER_BUFFERED_DATA ), \scsi_opcode_name (MODE_SELECT ), \ -scsi_opcode_name (RESERVE ), \ -scsi_opcode_name (RELEASE ), \ +scsi_opcode_name (RESERVE_6 ), \ +scsi_opcode_name (RELEASE_6 ), \scsi_opcode_name (COPY ), \scsi_opcode_name (ERASE ), \ scsi_opcode_name(MODE_SENSE), \
Martin K. Petersen
AppliedBart,
Quoted 2 lines
The names RESERVE and RELEASE are not only used in <
scsi/scsi_proto.h> but also elsewhere in the kernel:
Applied to 6.15/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Bart Van Assche
The names RESERVE and RELEASE are not only used in <
scsi/scsi_proto.h> but also elsewhere in the kernel:$ git grep -nHE 'define[[:blank:]]*(RESERVE|RELEASE)[[:blank:]]' drivers/input/joystick/walkera0701.c:13:#define RESERVE 20000 drivers/s390/char/tape_std.h:56:#define RELEASE 0xD4 /* 3420 NOP, 3480 REJECT */ drivers/s390/char/tape_std.h:58:#define RESERVE 0xF4 /* 3420 NOP, 3480 REJECT */[...]
Applied to 6.15/scsi-queue, thanks!
[1/1] scsi, usb: Rename the RESERVE and RELEASE constants
https://git.kernel.org/mkp/scsi/c/0ea163a18b17
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering