Commit 58bedf35 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: xen-scsiback: Use DID_ERROR instead of DRIVER_ERROR 

DRIVER_ERROR was supposed to signal an error generated by the driver, which
xen-scsiback arguably isn't. Also the driver bytes don't have a detailed
error recovery, so we should rather return DID_ERROR instead of
DRIVER_ERROR.

Link: https://lore.kernel.org/r/20210427083046.31620-13-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4bd51e54

drivers/xen/xen-scsiback.c

+4 −4
Original line number Diff line number Diff line
@@ -719,10 +719,10 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info, 
				result = DID_NO_CONNECT;

				break;

			default:

				result = DRIVER_ERROR;

				result = DID_ERROR;

				break;

			}

			scsiback_send_response(info, NULL, result << 24, 0,

			scsiback_send_response(info, NULL, result << 16, 0,

					       ring_req.rqid);

			return 1;

		}
@@ -732,7 +732,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info, 
			if (scsiback_gnttab_data_map(&ring_req, pending_req)) {

				scsiback_fast_flush_area(pending_req);

				scsiback_do_resp_with_sense(NULL,

						DRIVER_ERROR << 24, 0, pending_req);

						DID_ERROR << 16, 0, pending_req);

				transport_generic_free_cmd(&pending_req->se_cmd, 0);

			} else {

				scsiback_cmd_exec(pending_req);
@@ -747,7 +747,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info, 
			break;

		default:

			pr_err_ratelimited("invalid request\n");

			scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24, 0,

			scsiback_do_resp_with_sense(NULL, DID_ERROR << 16, 0,

						    pending_req);

			transport_generic_free_cmd(&pending_req->se_cmd, 0);

			break;