| From 4a067cf823d9d8e50d41cfb618011c0d4a969c72 Mon Sep 17 00:00:00 2001 |
| From: Martin Wilck <mwilck@suse.com> |
| Date: Thu, 14 Feb 2019 22:57:41 +0100 |
| Subject: scsi: core: reset host byte in DID_NEXUS_FAILURE case |
| |
| From: Martin Wilck <mwilck@suse.com> |
| |
| commit 4a067cf823d9d8e50d41cfb618011c0d4a969c72 upstream. |
| |
| Up to 4.12, __scsi_error_from_host_byte() would reset the host byte to |
| DID_OK for various cases including DID_NEXUS_FAILURE. Commit |
| 2a842acab109 ("block: introduce new block status code type") replaced this |
| function with scsi_result_to_blk_status() and removed the host-byte |
| resetting code for the DID_NEXUS_FAILURE case. As the line |
| set_host_byte(cmd, DID_OK) was preserved for the other cases, I suppose |
| this was an editing mistake. |
| |
| The fact that the host byte remains set after 4.13 is causing problems with |
| the sg_persist tool, which now returns success rather then exit status 24 |
| when a RESERVATION CONFLICT error is encountered. |
| |
| Fixes: 2a842acab109 "block: introduce new block status code type" |
| Signed-off-by: Martin Wilck <mwilck@suse.com> |
| Reviewed-by: Hannes Reinecke <hare@suse.com> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/scsi_lib.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/scsi/scsi_lib.c |
| +++ b/drivers/scsi/scsi_lib.c |
| @@ -757,6 +757,7 @@ static blk_status_t scsi_result_to_blk_s |
| set_host_byte(cmd, DID_OK); |
| return BLK_STS_TARGET; |
| case DID_NEXUS_FAILURE: |
| + set_host_byte(cmd, DID_OK); |
| return BLK_STS_NEXUS; |
| case DID_ALLOC_FAILURE: |
| set_host_byte(cmd, DID_OK); |
