diff mbox series

[29/42] mesh: translate message to host byte status

Message ID	20210421174749.11221-30-hare@suse.de
State	New
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Hannes Reinecke <hare@suse.de> To: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@lst.de>, James Bottomley <james.bottomley@hansenpartnership.com>, Bart van Assche <bvanassche@acm.org>, linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de> Subject: [PATCH 29/42] mesh: translate message to host byte status Date: Wed, 21 Apr 2021 19:47:36 +0200 Message-Id: <20210421174749.11221-30-hare@suse.de> In-Reply-To: <20210421174749.11221-1-hare@suse.de> References: <20210421174749.11221-1-hare@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	SCSI result cleanup, part 2 \| expand [RFC,00/42] SCSI result cleanup, part 2 [01/42] st: return error code in st_scsi_execute() [02/42] scsi_ioctl: return error code when blk_rq_map_kern() fails [03/42] scsi_dh_alua: do not interpret DRIVER_ERROR [04/42] scsi: Fixup calling convention for scsi_mode_sense() [05/42] scsi: stop using DRIVER_ERROR [06/42] scsi: introduce scsi_build_sense() [07/42] scsi: Kill DRIVER_SENSE [08/42] scsi: do not use DRIVER_INVALID [09/42] scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT [10/42] xen-scsiback: use DID_ERROR instead of DRIVER_ERROR [11/42] xen-scsifront: compability status handling [12/42] scsi: Drop the now obsolete driver_byte definitions [13/42] scsi: add get_{status,host}_byte() accessor function [14/42] scsi: add scsi_result_is_good() [15/42] NCR5380: use SCSI result accessors [16/42] NCR5380: Fold SCSI message ABORT onto DID_ABORT [17/42] scsi: add translate_msg_byte() [18/42] dc395: use standard macros to set SCSI result [19/42] dc395: translate message bytes [20/42] qlogicfas408: make ql_pcmd() a void function [21/42] qlogicfas408: whitespace cleanup [22/42] qlogicfas408: translate message to host byte status [23/42] nsp32: use standard macros to set SCSI result [24/42] nsp32: whitespace cleanup [25/42] nsp32: do not set message byte [26/42] wd33c93: use standard macros to set SCSI result [27/42] wd33c93: translate message byte to host byte [28/42] mesh: use standard macros to set SCSI result [29/42] mesh: translate message to host byte status [30/42] acornscsi: use standard macros to set SCSI result [31/42] acornscsi: remove acornscsi_reportstatus() [32/42] acornscsi: translate message byte to host byte [33/42] aha152x: modify done() to use separate status bytes [34/42] aha152x: do not set message byte when calling scsi_done() [35/42] advansys: do not set message byte in SCSI status [36/42] advansys: use SCSI result accessors [37/42] fas216: translate message to host byte status [38/42] fas216: convert to SCSI Accessors [39/42] fdomain: drop last argument to fdomain_finish_cmd() [40/42] fdomain: translate message to host byte status [41/42] scsi: drop message byte helper [42/42] scsi: kill message byte

Commit Message

Hannes Reinecke April 21, 2021, 5:47 p.m. UTC

Instead of setting the message byte translate it to a host byte
status. As the error recovery would map it to DID_ERROR anyway
the translation doesn't change the SCSI error handling.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/scsi/mesh.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 6052a47b03dc..5be587dd75ea 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -597,8 +597,9 @@  static void mesh_done(struct mesh_state *ms, int start_next)
 	if (cmd) {
 		set_host_byte(cmd, ms->stat);
 		set_status_byte(cmd, cmd->SCp.Status);
-		if (ms->stat == DID_OK)
-			set_msg_byte(cmd, cmd->SCp.Message);
+		if (get_host_byte(cmd) == DID_OK &&
+		    cmd->SCp.Message != COMMAND_COMPLETE)
+			translate_msg_byte(cmd, cmd->SCp.Message);
 		if (DEBUG_TARGET(cmd)) {
 			printk(KERN_DEBUG "mesh_done: result = %x, data_ptr=%d, buflen=%d\n",
 			       scsi_get_compat_result(cmd), ms->data_ptr, scsi_bufflen(cmd));