openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: core: Rename __scsi_error_from_host_byte() into scsi_result_to_blk_status() 

Since the next patch will modify this function such that it checks more than
just the host byte of the SCSI result, rename __scsi_error_from_host_byte()
into scsi_result_to_blk_status().  This patch does not change any
functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Douglas Gilbert <dgilbert@interlog.com>
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Lee Duncan <lduncan@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2018-04-05 10:33:00 -07:00 committed by Martin K. Petersen
parent cbe095e2b5
commit a77b32d8b1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/scsi/scsi_lib.c
View File

@ -723,14 +723,14 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
} }
/** /**
* __scsi_error_from_host_byte - translate SCSI error code into errno * scsi_result_to_blk_status - translate a SCSI result code into blk_status_t
* @cmd: SCSI command (unused) * @cmd: SCSI command
* @result: scsi error code * @result: scsi error code
* *
* Translate SCSI error code into block errors. * Translate a SCSI result code into a blk_status_t value. May reset the host
* byte of @cmd->result.
*/ */
static blk_status_t __scsi_error_from_host_byte(struct scsi_cmnd *cmd, static blk_status_t scsi_result_to_blk_status(struct scsi_cmnd *cmd, int result)
int result)
{ {
switch (host_byte(result)) { switch (host_byte(result)) {
case DID_TRANSPORT_FAILFAST: case DID_TRANSPORT_FAILFAST:
@ -810,10 +810,10 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
SCSI_SENSE_BUFFERSIZE); SCSI_SENSE_BUFFERSIZE);
} }
if (!sense_deferred) if (!sense_deferred)
error = __scsi_error_from_host_byte(cmd, result); error = scsi_result_to_blk_status(cmd, result);
} }
/* /*
* __scsi_error_from_host_byte may have reset the host_byte * scsi_result_to_blk_status may have reset the host_byte
*/ */
scsi_req(req)->result = cmd->result; scsi_req(req)->result = cmd->result;
scsi_req(req)->resid_len = scsi_get_resid(cmd); scsi_req(req)->resid_len = scsi_get_resid(cmd);
@ -835,7 +835,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
* good_bytes != blk_rq_bytes(req) as the signal for an error. * good_bytes != blk_rq_bytes(req) as the signal for an error.
* This sets the error explicitly for the problem case. * This sets the error explicitly for the problem case.
*/ */
error = __scsi_error_from_host_byte(cmd, result); error = scsi_result_to_blk_status(cmd, result);
} }
/* no bidi support for !blk_rq_is_passthrough yet */ /* no bidi support for !blk_rq_is_passthrough yet */
@ -905,7 +905,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
if (result == 0) if (result == 0)
goto requeue; goto requeue;
error = __scsi_error_from_host_byte(cmd, result); error = scsi_result_to_blk_status(cmd, result);
if (host_byte(result) == DID_RESET) { if (host_byte(result) == DID_RESET) {
/* Third party bus reset or reset for error recovery /* Third party bus reset or reset for error recovery