Commit a7479a84 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

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: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 54cf31d0

Documentation/scsi/scsi_mid_low_api.rst

+3 −3
Original line number Diff line number Diff line
@@ -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')

drivers/scsi/scsi_lib.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

include/trace/events/scsi.h

+1 −32
Original line number Diff line number Diff line
@@ -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))

);