scsi: core: Kill message byte

Remove last vestiges of SCSI status message bytes.

Link: https://lore.kernel.org/r/20210427083046.31620-39-hare@suse.de
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index b99b4e4..63ddea2 100644 (file)
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -1172,9 +1172,9 @@ Members of interest:
                    of 0 implies a successfully completed command (and all
                    data (if any) has been transferred to or from the SCSI
                    target device). 'result' is a 32 bit unsigned integer that
-                   can be viewed as 4 related bytes. The SCSI status value is
-                   in the LSB. See include/scsi/scsi.h status_byte(),
-                   msg_byte() and host_byte() macros and related constants.
+                   can be viewed as 2 related bytes. The SCSI status value is
+                   in the LSB. See include/scsi/scsi.h status_byte() and
+                   host_byte() macros and related constants.
     sense_buffer
                 - an array (maximum size: SCSI_SENSE_BUFFERSIZE bytes) that
                    should be written when the SCSI status (LSB of 'result')

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 75d633f..e3897bb 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -591,10 +591,7 @@ static blk_status_t scsi_result_to_blk_status(struct scsi_cmnd *cmd, int result)
 {
        switch (host_byte(result)) {
        case DID_OK:
-               /*
-                * Also check the other bytes than the status byte in result
-                */
-               if (scsi_status_is_good(result) && (result & ~0xff) == 0)
+               if (scsi_status_is_good(result))
                        return BLK_STS_OK;
                return BLK_STS_IOERR;
        case DID_TRANSPORT_FAILFAST:

diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index 428cca7..370ade0 100644 (file)
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -124,37 +124,6 @@
                scsi_hostbyte_name(DID_TRANSPORT_DISRUPTED),    \
                scsi_hostbyte_name(DID_TRANSPORT_FAILFAST))
 
-#define scsi_msgbyte_name(result)      { result, #result }
-#define show_msgbyte_name(val)                                 \
-       __print_symbolic(val,                                   \
-               scsi_msgbyte_name(COMMAND_COMPLETE),            \
-               scsi_msgbyte_name(EXTENDED_MESSAGE),            \
-               scsi_msgbyte_name(SAVE_POINTERS),               \
-               scsi_msgbyte_name(RESTORE_POINTERS),            \
-               scsi_msgbyte_name(DISCONNECT),                  \
-               scsi_msgbyte_name(INITIATOR_ERROR),             \
-               scsi_msgbyte_name(ABORT_TASK_SET),              \
-               scsi_msgbyte_name(MESSAGE_REJECT),              \
-               scsi_msgbyte_name(NOP),                         \
-               scsi_msgbyte_name(MSG_PARITY_ERROR),            \
-               scsi_msgbyte_name(LINKED_CMD_COMPLETE),         \
-               scsi_msgbyte_name(LINKED_FLG_CMD_COMPLETE),     \
-               scsi_msgbyte_name(TARGET_RESET),                \
-               scsi_msgbyte_name(ABORT_TASK),                  \
-               scsi_msgbyte_name(CLEAR_TASK_SET),              \
-               scsi_msgbyte_name(INITIATE_RECOVERY),           \
-               scsi_msgbyte_name(RELEASE_RECOVERY),            \
-               scsi_msgbyte_name(CLEAR_ACA),                   \
-               scsi_msgbyte_name(LOGICAL_UNIT_RESET),          \
-               scsi_msgbyte_name(SIMPLE_QUEUE_TAG),            \
-               scsi_msgbyte_name(HEAD_OF_QUEUE_TAG),           \
-               scsi_msgbyte_name(ORDERED_QUEUE_TAG),           \
-               scsi_msgbyte_name(IGNORE_WIDE_RESIDUE),         \
-               scsi_msgbyte_name(ACA),                         \
-               scsi_msgbyte_name(QAS_REQUEST),                 \
-               scsi_msgbyte_name(BUS_DEVICE_RESET),            \
-               scsi_msgbyte_name(ABORT))
-
 #define scsi_statusbyte_name(result)   { result, #result }
 #define show_statusbyte_name(val)                              \
        __print_symbolic(val,                                   \
@@ -316,7 +285,7 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
                  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
                  "DRIVER_OK",
                  show_hostbyte_name(((__entry->result) >> 16) & 0xff),
-                 show_msgbyte_name(((__entry->result) >> 8) & 0xff),
+                 "COMMAND_COMPLETE",
                  show_statusbyte_name(__entry->result & 0xff))
 );