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>,
linux-scsi@vger.kernel.org, Bart van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 09/39] scsi: do not use DRIVER_INVALID
Date: Fri, 23 Apr 2021 13:39:14 +0200 [thread overview]
Message-ID: <20210423113944.42672-10-hare@suse.de> (raw)
In-Reply-To: <20210423113944.42672-1-hare@suse.de>
There is no point in returning DID_ABORT together with DRIVER_INVALID,
as the caller couldn't care less where the abort originated.
So drop the use of DRIVER_INVALID.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/hptiop.c | 2 +-
drivers/scsi/mvumi.c | 4 ++--
drivers/scsi/vmw_pvscsi.c | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index db4c7a7ff4dd..61cda7b7624f 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -760,7 +760,7 @@ static void hptiop_finish_scsi_req(struct hptiop_hba *hba, u32 tag,
goto skip_resid;
default:
- scp->result = DRIVER_INVALID << 24 | DID_ABORT << 16;
+ scp->result = DID_ABORT << 16;
break;
}
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index f61250545025..6bb03d7a254d 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -1320,7 +1320,7 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd,
}
break;
default:
- scmd->result |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+ scmd->result |= (DID_ABORT << 16);
break;
}
@@ -2127,7 +2127,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)
else
atomic_dec(&mhba->fw_outstanding);
- scmd->result = (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+ scmd->result = (DID_ABORT << 16);
scmd->SCp.ptr = NULL;
if (scsi_bufflen(scmd)) {
dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd),
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index f0707eaad9f7..f57f8bc037d2 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -601,9 +601,6 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,
case BTSTAT_LUNMISMATCH:
case BTSTAT_TAGREJECT:
case BTSTAT_BADMSG:
- cmd->result = (DRIVER_INVALID << 24);
- fallthrough;
-
case BTSTAT_HAHARDWARE:
case BTSTAT_INVPHASE:
case BTSTAT_HATIMEOUT:
--
2.29.2
next prev parent reply other threads:[~2021-04-23 11:40 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 11:39 [RFC PATCHv2 00/39] SCSI result cleanup, part 2 Hannes Reinecke
2021-04-23 11:39 ` [PATCH 01/39] st: return error code in st_scsi_execute() Hannes Reinecke
2021-04-26 3:19 ` Bart Van Assche
2021-04-26 14:51 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 02/39] scsi_ioctl: return error code when blk_rq_map_kern() fails Hannes Reinecke
2021-04-26 3:20 ` Bart Van Assche
2021-04-26 14:51 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 03/39] scsi_dh_alua: do not interpret DRIVER_ERROR Hannes Reinecke
2021-04-26 14:54 ` Christoph Hellwig
2021-04-26 15:17 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 04/39] scsi: Fixup calling convention for scsi_mode_sense() Hannes Reinecke
2021-04-26 3:21 ` Bart Van Assche
2021-04-26 14:57 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 05/39] scsi: stop using DRIVER_ERROR Hannes Reinecke
2021-04-26 3:26 ` Bart Van Assche
2021-04-26 15:01 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 06/39] scsi: introduce scsi_build_sense() Hannes Reinecke
2021-04-26 3:31 ` Bart Van Assche
2021-04-26 15:02 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 07/39] scsi: introduce scsi_status_is_check_condition() Hannes Reinecke
2021-04-26 3:34 ` Bart Van Assche
2021-04-26 6:58 ` Hannes Reinecke
2021-04-26 15:02 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 08/39] scsi: Kill DRIVER_SENSE Hannes Reinecke
2021-04-26 3:41 ` Bart Van Assche
2021-04-26 7:02 ` Hannes Reinecke
2021-04-26 15:20 ` Christoph Hellwig
2021-04-27 7:15 ` Hannes Reinecke
2021-04-23 11:39 ` Hannes Reinecke [this message]
2021-04-26 3:42 ` [PATCH 09/39] scsi: do not use DRIVER_INVALID Bart Van Assche
2021-04-26 15:20 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 10/39] scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT Hannes Reinecke
2021-04-26 3:42 ` Bart Van Assche
2021-04-26 15:21 ` Christoph Hellwig
2021-04-26 15:38 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 11/39] xen-scsiback: use DID_ERROR instead of DRIVER_ERROR Hannes Reinecke
2021-04-26 3:43 ` Bart Van Assche
2021-04-26 15:22 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 12/39] xen-scsifront: compability status handling Hannes Reinecke
2021-04-26 3:44 ` Bart Van Assche
2021-04-26 7:03 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 13/39] scsi: Drop the now obsolete driver_byte definitions Hannes Reinecke
2021-04-26 3:46 ` Bart Van Assche
2021-04-26 15:22 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 14/39] NCR5380: Fold SCSI message ABORT onto DID_ABORT Hannes Reinecke
2021-04-26 15:23 ` Christoph Hellwig
2021-04-26 15:43 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 15/39] scsi: add get_{status,host}_byte() accessor function Hannes Reinecke
2021-04-26 3:47 ` Bart Van Assche
2021-04-26 7:05 ` Hannes Reinecke
2021-04-26 15:23 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 16/39] scsi: add translate_msg_byte() Hannes Reinecke
2021-04-26 3:48 ` Bart Van Assche
2021-04-26 15:24 ` Christoph Hellwig
2021-04-26 15:43 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 17/39] dc395: use standard macros to set SCSI result Hannes Reinecke
2021-04-26 15:25 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 18/39] dc395: translate message bytes Hannes Reinecke
2021-04-26 15:25 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 19/39] qlogicfas408: make ql_pcmd() a void function Hannes Reinecke
2021-04-26 15:26 ` Christoph Hellwig
2021-04-26 15:45 ` Hannes Reinecke
2021-04-27 7:36 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 20/39] qlogicfas408: whitespace cleanup Hannes Reinecke
2021-04-23 11:39 ` [PATCH 21/39] qlogicfas408: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 22/39] nsp32: whitespace cleanup Hannes Reinecke
2021-04-23 11:39 ` [PATCH 23/39] nsp32: do not set message byte Hannes Reinecke
2021-04-23 11:39 ` [PATCH 24/39] wd33c93: translate message byte to host byte Hannes Reinecke
2021-04-24 9:20 ` Finn Thain
2021-04-26 9:07 ` Hannes Reinecke
2021-04-27 4:39 ` Finn Thain
2021-04-27 6:11 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 25/39] mesh: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 26/39] acornscsi: remove acornscsi_reportstatus() Hannes Reinecke
2021-04-26 15:32 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 27/39] acornscsi: translate message byte to host byte Hannes Reinecke
2021-04-23 11:39 ` [PATCH 28/39] aha152x: modify done() to use separate status bytes Hannes Reinecke
2021-04-23 11:39 ` [PATCH 29/39] aha152x: do not set message byte when calling scsi_done() Hannes Reinecke
2021-04-23 11:39 ` [PATCH 30/39] advansys: do not set message byte in SCSI status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 31/39] fas216: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 32/39] fas216: Use get_status_byte() to avoid using linux-specific status codes Hannes Reinecke
2021-04-23 11:39 ` [PATCH 33/39] FlashPoint: Use standard SCSI definitions Hannes Reinecke
2021-04-23 11:39 ` [PATCH 34/39] fdomain: drop last argument to fdomain_finish_cmd() Hannes Reinecke
2021-04-23 11:39 ` [PATCH 35/39] fdomain: translate message to host byte status Hannes Reinecke
2021-04-24 9:21 ` Finn Thain
2021-04-23 11:39 ` [PATCH 36/39] scsi: drop message byte helper Hannes Reinecke
2021-04-26 3:48 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 37/39] scsi: kill message byte Hannes Reinecke
2021-04-26 3:50 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 38/39] target: use standard SAM status types Hannes Reinecke
2021-04-26 3:51 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 39/39] scsi: drop obsolete linux-specific SCSI status codes Hannes Reinecke
2021-04-26 3:55 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210423113944.42672-10-hare@suse.de \
--to=hare@suse.de \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox