From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Bart Van Assche <bvanassche@acm.org>,
Tyrel Datwyler <tyreld@linux.ibm.com>
Subject: [PATCH 056/117] ibmvscsi: Convert to the scsi_status union
Date: Mon, 19 Apr 2021 17:07:44 -0700 [thread overview]
Message-ID: <20210420000845.25873-57-bvanassche@acm.org> (raw)
In-Reply-To: <20210420000845.25873-1-bvanassche@acm.org>
An explanation of the purpose of this patch is available in the patch
"scsi: Introduce the scsi_status union".
Cc: Tyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/ibmvscsi/ibmvscsi.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index f33f56680c59..1a02dc411f0d 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -793,7 +793,7 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code)
spin_unlock_irqrestore(hostdata->host->host_lock, flags);
if (evt->cmnd) {
- evt->cmnd->result = (error_code << 16);
+ evt->cmnd->status.combined = (error_code << 16);
unmap_cmd_data(&evt->iu.srp.cmd, evt,
evt->hostdata->dev);
if (evt->cmnd_done)
@@ -976,7 +976,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
if (evt_struct->cmnd != NULL) {
- evt_struct->cmnd->result = DID_ERROR << 16;
+ evt_struct->cmnd->status.combined = DID_ERROR << 16;
evt_struct->cmnd_done(evt_struct->cmnd);
} else if (evt_struct->done)
evt_struct->done(evt_struct);
@@ -1004,8 +1004,8 @@ static void handle_cmd_rsp(struct srp_event_struct *evt_struct)
}
if (cmnd) {
- cmnd->result |= rsp->status;
- if (((cmnd->result >> 1) & 0x1f) == CHECK_CONDITION)
+ cmnd->status.combined |= rsp->status;
+ if (((cmnd->status.combined >> 1) & 0x1f) == CHECK_CONDITION)
memcpy(cmnd->sense_buffer,
rsp->data,
be32_to_cpu(rsp->sense_data_len));
@@ -1049,7 +1049,7 @@ static int ibmvscsi_queuecommand_lck(struct scsi_cmnd *cmnd,
u16 lun = lun_from_dev(cmnd->device);
u8 out_fmt, in_fmt;
- cmnd->result = (DID_OK << 16);
+ cmnd->status.combined = (DID_OK << 16);
evt_struct = get_event_struct(&hostdata->pool);
if (!evt_struct)
return SCSI_MLQUEUE_HOST_BUSY;
@@ -1608,7 +1608,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
sdev_printk(KERN_INFO, cmd->device, "successfully aborted task tag 0x%llx\n",
tsk_mgmt->task_tag);
- cmd->result = (DID_ABORT << 16);
+ cmd->status.combined = (DID_ABORT << 16);
list_del(&found_evt->list);
unmap_cmd_data(&found_evt->iu.srp.cmd, found_evt,
found_evt->hostdata->dev);
@@ -1713,7 +1713,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
list_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {
if ((tmp_evt->cmnd) && (tmp_evt->cmnd->device == cmd->device)) {
if (tmp_evt->cmnd)
- tmp_evt->cmnd->result = (DID_RESET << 16);
+ tmp_evt->cmnd->status.combined = (DID_RESET << 16);
list_del(&tmp_evt->list);
unmap_cmd_data(&tmp_evt->iu.srp.cmd, tmp_evt,
tmp_evt->hostdata->dev);
@@ -1842,7 +1842,7 @@ static void ibmvscsi_handle_crq(struct viosrp_crq *crq,
del_timer(&evt_struct->timer);
if ((crq->status != VIOSRP_OK && crq->status != VIOSRP_OK2) && evt_struct->cmnd)
- evt_struct->cmnd->result = DID_ERROR << 16;
+ evt_struct->cmnd->status.combined = DID_ERROR << 16;
if (evt_struct->done)
evt_struct->done(evt_struct);
else
next prev parent reply other threads:[~2021-04-20 0:10 UTC|newest]
Thread overview: 158+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 0:06 [PATCH 000/117] Make better use of static type checking Bart Van Assche
2021-04-20 0:06 ` [PATCH 001/117] libsas: Introduce more SAM status code aliases in enum exec_status Bart Van Assche
2021-04-20 0:06 ` [PATCH 002/117] Introduce enums for the SAM, message, host and driver status codes Bart Van Assche
2021-04-20 9:23 ` Steffen Maier
2021-04-20 14:59 ` Bart Van Assche
2021-04-20 0:06 ` [PATCH 003/117] Change the type of the second argument of scsi_host_complete_all_commands() Bart Van Assche
2021-04-20 0:06 ` [PATCH 004/117] libiscsi: Use the host_status enum Bart Van Assche
2021-05-06 16:51 ` Lee Duncan
2021-04-20 0:06 ` [PATCH 005/117] libsas: Use the host_status and sam_status enums Bart Van Assche
2021-04-20 0:06 ` [PATCH 006/117] target: Use enum sam_status instead of u8 Bart Van Assche
2021-04-20 0:06 ` [PATCH 007/117] lpfc: Reformat four comparisons Bart Van Assche
2021-04-21 20:22 ` James Smart
2021-04-20 0:06 ` [PATCH 008/117] fc: Add a compile-time structure size check Bart Van Assche
2021-04-20 0:06 ` [PATCH 009/117] iscsi: " Bart Van Assche
2021-05-06 16:52 ` Lee Duncan
2021-04-20 0:06 ` [PATCH 010/117] ufs: " Bart Van Assche
2021-05-06 23:56 ` Can Guo
2021-04-20 0:06 ` [PATCH 011/117] Introduce the scsi_status union Bart Van Assche
2021-05-06 17:04 ` Lee Duncan
2021-05-07 0:04 ` Can Guo
2021-04-20 0:07 ` [PATCH 012/117] block: Convert SCSI and bsg code to " Bart Van Assche
2021-04-20 0:07 ` [PATCH 013/117] core: Convert " Bart Van Assche
2021-04-20 0:07 ` [PATCH 014/117] ch: Pass union scsi_status to driver_byte() Bart Van Assche
2021-04-20 0:07 ` [PATCH 015/117] sd: Convert to the scsi_status union Bart Van Assche
2021-04-20 0:07 ` [PATCH 016/117] sr: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 017/117] st: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 018/117] sg: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 019/117] 3w*: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 020/117] 53c700: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 021/117] BusLogic: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 022/117] NCR5380: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 023/117] a100u2w: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 024/117] aacraid: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 025/117] acornscsi: Annotate fallthrough Bart Van Assche
2021-04-20 0:07 ` [PATCH 026/117] acornscsi: Convert to the scsi_status union Bart Van Assche
2021-04-20 0:07 ` [PATCH 027/117] advansys: " Bart Van Assche
2021-04-20 1:49 ` Matthew Wilcox
2021-04-20 2:27 ` Douglas Gilbert
2021-04-20 3:20 ` Bart Van Assche
2021-04-20 3:17 ` Bart Van Assche
2021-04-20 3:23 ` Matthew Wilcox
2021-04-20 15:01 ` Bart Van Assche
2021-04-20 0:07 ` [PATCH 028/117] aha*: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 029/117] aic*: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 030/117] arcmsr: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 031/117] ata: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 032/117] atp870u: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 033/117] be2iscsi: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 034/117] bfa: Use type int32_t to represent a signed integer Bart Van Assche
2021-04-20 0:07 ` [PATCH 035/117] bfa: Convert to the scsi_status union Bart Van Assche
2021-04-20 0:07 ` [PATCH 036/117] bnx2fc: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 037/117] cdrom: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 038/117] csiostor: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 039/117] cxlflash: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 040/117] dc395x: Use the set_{host,msg,status}_byte() functions Bart Van Assche
2021-04-20 0:07 ` [PATCH 041/117] dc395x: Convert to the scsi_status union Bart Van Assche
2021-04-20 0:07 ` [PATCH 042/117] dpt_i2o: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 043/117] esas2r: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 044/117] esp_scsi: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 045/117] fas216: Fix two source code comments Bart Van Assche
2021-04-20 0:07 ` [PATCH 046/117] fas216: Convert to the scsi_status union Bart Van Assche
2021-04-20 0:07 ` [PATCH 047/117] fc: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 048/117] fdomain: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 049/117] firewire: sbp2: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 050/117] fnic: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 051/117] hpsa: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 052/117] hptiop: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 053/117] ib_srp: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 054/117] ibmvfc: Fix the documentation of the return value of ibmvfc_host_chkready() Bart Van Assche
2021-04-20 0:07 ` [PATCH 055/117] ibmvfc: Convert to the scsi_status union Bart Van Assche
2021-04-20 0:07 ` Bart Van Assche [this message]
2021-04-20 0:07 ` [PATCH 057/117] ide: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 058/117] imm: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 059/117] initio: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 060/117] ipr: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 061/117] ips: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 062/117] iscsi: " Bart Van Assche
2021-05-06 18:54 ` Lee Duncan
2021-04-20 0:07 ` [PATCH 063/117] libfc: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 064/117] sas: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 065/117] lpfc: " Bart Van Assche
2021-04-21 20:26 ` James Smart
2021-04-20 0:07 ` [PATCH 066/117] mac53c94: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 067/117] megaraid: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 068/117] mesh: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 069/117] message: fusion: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 070/117] mpt3sas: " Bart Van Assche
2021-04-20 0:07 ` [PATCH 071/117] mvumi: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 072/117] myrb: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 073/117] myrs: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 074/117] ncr53c8xx: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 075/117] nfsd: " Bart Van Assche
2021-04-20 14:36 ` Chuck Lever III
2021-04-20 16:44 ` Bart Van Assche
2021-04-21 14:22 ` Chuck Lever III
2021-04-21 16:12 ` Bart Van Assche
2021-04-21 16:27 ` Chuck Lever III
2021-04-20 0:08 ` [PATCH 076/117] nsp32: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 077/117] pcmcia: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 078/117] pktcdvd: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 079/117] pmcraid: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 080/117] ppa: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 081/117] ps3rom: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 082/117] qedf: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 083/117] qedi: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 084/117] qla1280: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 085/117] qla2xxx: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 086/117] qla4xxx: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 087/117] qlogicfas408: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 088/117] qlogicpti: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 089/117] s390/zfcp: " Bart Van Assche
2021-04-20 0:08 ` [PATCH 090/117] scsi_debug: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 091/117] smartpqi: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 092/117] snic: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 093/117] staging: " Bart Van Assche
2021-04-20 7:47 ` Greg Kroah-Hartman
2021-04-20 15:02 ` Bart Van Assche
2021-04-20 15:06 ` Greg Kroah-Hartman
2021-04-20 2:13 ` [PATCH 094/117] stex: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 095/117] storvsc: " Bart Van Assche
2021-04-20 19:39 ` Wei Liu
2021-04-20 2:13 ` [PATCH 096/117] sym53c8xx_2: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 097/117] target: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 098/117] ufs: Remove an unused structure member Bart Van Assche
2021-05-06 23:57 ` Can Guo
2021-04-20 2:13 ` [PATCH 099/117] ufs: Remove a local variable Bart Van Assche
2021-05-06 23:56 ` Can Guo
2021-04-20 2:13 ` [PATCH 100/117] ufs: Use enum sam_status where appropriate Bart Van Assche
2021-05-07 0:01 ` Can Guo
2021-05-07 0:01 ` Can Guo
2021-04-20 2:13 ` [PATCH 101/117] ufs: Remove an assignment from ufshcd_transfer_rsp_status() Bart Van Assche
2021-05-07 0:03 ` Can Guo
2021-04-20 2:13 ` [PATCH 102/117] ufs: Convert to the scsi_status union Bart Van Assche
2021-05-07 0:09 ` Can Guo
2021-05-07 3:35 ` Bart Van Assche
2021-05-07 4:48 ` Can Guo
2021-04-20 2:13 ` [PATCH 103/117] usb: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 104/117] virtio-scsi: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 105/117] vmw_pvscsi: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 106/117] wd33c93: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 107/117] wd719x: " Bart Van Assche
2021-04-20 2:13 ` [PATCH 108/117] xen-scsiback: Pass union status to the {status,msg,host,driver}_byte() macros Bart Van Assche
2021-04-20 2:13 ` [PATCH 109/117] xen-scsifront: Convert to the scsi_status union Bart Van Assche
2021-04-20 2:13 ` [PATCH 110/117] Finalize the switch from 'int' to 'union scsi_status' Bart Van Assche
2021-05-06 18:55 ` Lee Duncan
2021-05-07 0:24 ` Can Guo
2021-04-20 2:13 ` [PATCH 111/117] Use the scsi_status union more widely Bart Van Assche
2021-04-20 2:13 ` [PATCH 112/117] Change the return type of scsi_execute() into union scsi_status Bart Van Assche
2021-04-20 2:13 ` [PATCH 113/117] Change the return type of scsi_execute_req() " Bart Van Assche
2021-04-20 2:13 ` [PATCH 114/117] Change the return type of scsi_test_unit_ready() " Bart Van Assche
2021-04-20 2:14 ` [PATCH 115/117] Change the return types of scsi_mode_sense() and sd_do_mode_sense() Bart Van Assche
2021-04-20 2:14 ` [PATCH 116/117] Change the return type of scsi_mode_select() into union scsi_status Bart Van Assche
2021-04-20 2:14 ` [PATCH 117/117] Change the return type of ioctl_internal_command() " Bart Van Assche
2021-04-20 6:04 ` [PATCH 000/117] Make better use of static type checking Hannes Reinecke
2021-04-20 16:12 ` Bart Van Assche
2021-04-20 17:11 ` Hannes Reinecke
2021-04-20 21:10 ` Bart Van Assche
2021-04-20 17:19 ` Douglas Gilbert
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=20210420000845.25873-57-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=tyreld@linux.ibm.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