Commit 73432693 authored by Niklas Cassel's avatar Niklas Cassel Committed by Martin K. Petersen

scsi: core: Rename and move get_scsi_ml_byte()

SCSI has two different getters:

 - get_XXX_byte() (in scsi_cmnd.h) which takes a struct scsi_cmnd *, and

 - XXX_byte() (in scsi.h) which takes a scmd->result.

The proper name for get_scsi_ml_byte() should thus be without the get_
prefix, as it takes a scmd->result. Rename the function to rectify this.
(This change was suggested by Mike Christie.)

Additionally, move get_scsi_ml_byte() to scsi_priv.h since both scsi_lib.c
and scsi_error.c will need to use this helper in a follow-up patch.

Cc: Mike Christie <michael.christie@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Link: https://lore.kernel.org/r/20230511011356.227789-6-nks@flawful.orgSigned-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3d848ca1
...@@ -578,11 +578,6 @@ static bool scsi_end_request(struct request *req, blk_status_t error, ...@@ -578,11 +578,6 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
return false; return false;
} }
static inline u8 get_scsi_ml_byte(int result)
{
return (result >> 8) & 0xff;
}
/** /**
* scsi_result_to_blk_status - translate a SCSI result code into blk_status_t * scsi_result_to_blk_status - translate a SCSI result code into blk_status_t
* @result: scsi error code * @result: scsi error code
...@@ -595,7 +590,7 @@ static blk_status_t scsi_result_to_blk_status(int result) ...@@ -595,7 +590,7 @@ static blk_status_t scsi_result_to_blk_status(int result)
* Check the scsi-ml byte first in case we converted a host or status * Check the scsi-ml byte first in case we converted a host or status
* byte. * byte.
*/ */
switch (get_scsi_ml_byte(result)) { switch (scsi_ml_byte(result)) {
case SCSIML_STAT_OK: case SCSIML_STAT_OK:
break; break;
case SCSIML_STAT_RESV_CONFLICT: case SCSIML_STAT_RESV_CONFLICT:
......
...@@ -29,6 +29,11 @@ enum scsi_ml_status { ...@@ -29,6 +29,11 @@ enum scsi_ml_status {
SCSIML_STAT_TGT_FAILURE = 0x04, /* Permanent target failure */ SCSIML_STAT_TGT_FAILURE = 0x04, /* Permanent target failure */
}; };
static inline u8 scsi_ml_byte(int result)
{
return (result >> 8) & 0xff;
}
/* /*
* Scsi Error Handler Flags * Scsi Error Handler Flags
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment