Commit c9293c11 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen

scsi: core: Rename status_byte to sg_status_byte

The next patch adds a helper status_byte function that works like
host_byte, so this patch renames the old status_byte to sg_status_byte
since it's only used for SG IO.
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20221122032603.32766-3-michael.christie@oracle.comReviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 255c4f4a
...@@ -376,7 +376,7 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, ...@@ -376,7 +376,7 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
* fill in all the output members * fill in all the output members
*/ */
hdr->status = scmd->result & 0xff; hdr->status = scmd->result & 0xff;
hdr->masked_status = status_byte(scmd->result); hdr->masked_status = sg_status_byte(scmd->result);
hdr->msg_status = COMMAND_COMPLETE; hdr->msg_status = COMMAND_COMPLETE;
hdr->host_status = host_byte(scmd->result); hdr->host_status = host_byte(scmd->result);
hdr->driver_status = 0; hdr->driver_status = 0;
......
...@@ -1349,7 +1349,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status) ...@@ -1349,7 +1349,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status)
struct scsi_sense_hdr sshdr; struct scsi_sense_hdr sshdr;
srp->header.status = 0xff & result; srp->header.status = 0xff & result;
srp->header.masked_status = status_byte(result); srp->header.masked_status = sg_status_byte(result);
srp->header.msg_status = COMMAND_COMPLETE; srp->header.msg_status = COMMAND_COMPLETE;
srp->header.host_status = host_byte(result); srp->header.host_status = host_byte(result);
srp->header.driver_status = driver_byte(result); srp->header.driver_status = driver_byte(result);
......
...@@ -159,7 +159,7 @@ struct compat_sg_io_hdr { ...@@ -159,7 +159,7 @@ struct compat_sg_io_hdr {
#define TASK_ABORTED 0x20 #define TASK_ABORTED 0x20
/* Obsolete status_byte() declaration */ /* Obsolete status_byte() declaration */
#define status_byte(result) (((result) >> 1) & 0x7f) #define sg_status_byte(result) (((result) >> 1) & 0x7f)
typedef struct sg_scsi_id { /* used by SG_GET_SCSI_ID ioctl() */ typedef struct sg_scsi_id { /* used by SG_GET_SCSI_ID ioctl() */
int host_no; /* as in "scsi<n>" where 'n' is one of 0, 1, 2 etc */ int host_no; /* as in "scsi<n>" where 'n' is one of 0, 1, 2 etc */
......
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