diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2024-09-25 14:20:22 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-12-01 02:46:05 +0000 |
| commit | 159756c6add92694f5c0208550b1307fec9e4902 (patch) | |
| tree | b4649ee42449d1c897e8c1cb14c013ee1555c9b9 | |
| parent | 081207e22c173a8f49982e31610657d97a8d78aa (diff) | |
ctl_report_supported_opcodes: Rename invalid label to invalid_options
This error handling is specific to an invalid value in the REPORTING
OPTIONS field of a REPORT SUPPORTED OPERATION CODES command.
While here, reuse the label for another case.
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D46775
(cherry picked from commit 0063ef79f9e6b9ad47969af3b94ae63e7888852c)
| -rw-r--r-- | sys/cam/ctl/ctl.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 5c33645f0f0d..1a1a27ae16dd 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -7494,33 +7494,26 @@ ctl_report_supported_opcodes(struct ctl_scsiio *ctsio) break; case RSO_OPTIONS_OC: if (ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) { - ctl_set_invalid_field(/*ctsio*/ ctsio, - /*sks_valid*/ 1, - /*command*/ 1, - /*field*/ 2, - /*bit_valid*/ 1, - /*bit*/ 2); - ctl_done((union ctl_io *)ctsio); - return (CTL_RETVAL_COMPLETE); + goto invalid_options; } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; case RSO_OPTIONS_OC_SA: if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 || service_action >= 32) { - goto invalid; + goto invalid_options; } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; case RSO_OPTIONS_OC_ASA: if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) != 0 && service_action >= 32) { - goto invalid; + goto invalid_options; } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; default: -invalid: +invalid_options: ctl_set_invalid_field(/*ctsio*/ ctsio, /*sks_valid*/ 1, /*command*/ 1, |