Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: mesh: Translate message to host byte status

Browse Source 
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.

Link: https://lore.kernel.org/r/20210427083046.31620-27-hare@suse.de
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2021-04-27 10:30:32 +02:00 committed by Martin K. Petersen
parent 6e39836ebc
commit 3ff451e929
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/mesh.c
View File

@ -595,9 +595,10 @@ static void mesh_done(struct mesh_state *ms, int start_next)
ms->current_req = NULL; ms->current_req = NULL;
tp->current_req = NULL; tp->current_req = NULL;
if (cmd) { if (cmd) {
cmd->result = (ms->stat << 16) | cmd->SCp.Status; set_host_byte(cmd, ms->stat);
set_status_byte(cmd, cmd->SCp.Status);
if (ms->stat == DID_OK) if (ms->stat == DID_OK)
cmd->result |= cmd->SCp.Message << 8; scsi_msg_to_host_byte(cmd, cmd->SCp.Message);
if (DEBUG_TARGET(cmd)) { if (DEBUG_TARGET(cmd)) {
printk(KERN_DEBUG "mesh_done: result = %x, data_ptr=%d, buflen=%d\n", printk(KERN_DEBUG "mesh_done: result = %x, data_ptr=%d, buflen=%d\n",
cmd->result, ms->data_ptr, scsi_bufflen(cmd)); cmd->result, ms->data_ptr, scsi_bufflen(cmd));
@ -993,7 +994,7 @@ static void handle_reset(struct mesh_state *ms)
for (tgt = 0; tgt < 8; ++tgt) { for (tgt = 0; tgt < 8; ++tgt) {
tp = &ms->tgts[tgt]; tp = &ms->tgts[tgt];
if ((cmd = tp->current_req) != NULL) { if ((cmd = tp->current_req) != NULL) {
cmd->result = DID_RESET << 16; set_host_byte(cmd, DID_RESET);
tp->current_req = NULL; tp->current_req = NULL;
mesh_completed(ms, cmd); mesh_completed(ms, cmd);
} }
@ -1003,7 +1004,7 @@ static void handle_reset(struct mesh_state *ms)
ms->current_req = NULL; ms->current_req = NULL;
while ((cmd = ms->request_q) != NULL) { while ((cmd = ms->request_q) != NULL) {
ms->request_q = (struct scsi_cmnd *) cmd->host_scribble; ms->request_q = (struct scsi_cmnd *) cmd->host_scribble;
cmd->result = DID_RESET << 16; set_host_byte(cmd, DID_RESET);
mesh_completed(ms, cmd); mesh_completed(ms, cmd);
} }
ms->phase = idle; ms->phase = idle;