[089/117] s390/zfcp: Convert to the scsi_status union

Message ID	20210420000845.25873-90-bvanassche@acm.org (mailing list archive)
State	Deferred
Headers	show Return-Path: <linux-scsi-owner@kernel.org> 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>, Julian Wiedmann <jwi@linux.ibm.com>, Benjamin Block <bblock@linux.ibm.com>, Steffen Maier <maier@linux.ibm.com> Subject: [PATCH 089/117] s390/zfcp: Convert to the scsi_status union Date: Mon, 19 Apr 2021 17:08:17 -0700 Message-Id: <20210420000845.25873-90-bvanassche@acm.org> In-Reply-To: <20210420000845.25873-1-bvanassche@acm.org> References: <20210420000845.25873-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Make better use of static type checking \| expand [000/117] Make better use of static type checking [001/117] libsas: Introduce more SAM status code aliases in enum exec_status [002/117] Introduce enums for the SAM, message, host and driver status codes [003/117] Change the type of the second argument of scsi_host_complete_all_commands() [004/117] libiscsi: Use the host_status enum [005/117] libsas: Use the host_status and sam_status enums [006/117] target: Use enum sam_status instead of u8 [007/117] lpfc: Reformat four comparisons [008/117] fc: Add a compile-time structure size check [009/117] iscsi: Add a compile-time structure size check [010/117] ufs: Add a compile-time structure size check [011/117] Introduce the scsi_status union [012/117] block: Convert SCSI and bsg code to the scsi_status union [013/117] core: Convert to the scsi_status union [014/117] ch: Pass union scsi_status to driver_byte() [015/117] sd: Convert to the scsi_status union [016/117] sr: Convert to the scsi_status union [017/117] st: Convert to the scsi_status union [018/117] sg: Convert to the scsi_status union [019/117] 3w: Convert to the scsi_status union [020/117] 53c700: Convert to the scsi_status union [021/117] BusLogic: Convert to the scsi_status union [022/117] NCR5380: Convert to the scsi_status union [023/117] a100u2w: Convert to the scsi_status union [024/117] aacraid: Convert to the scsi_status union [025/117] acornscsi: Annotate fallthrough [026/117] acornscsi: Convert to the scsi_status union [027/117] advansys: Convert to the scsi_status union [028/117] aha: Convert to the scsi_status union [029/117] aic*: Convert to the scsi_status union [030/117] arcmsr: Convert to the scsi_status union [031/117] ata: Convert to the scsi_status union [032/117] atp870u: Convert to the scsi_status union [033/117] be2iscsi: Convert to the scsi_status union [034/117] bfa: Use type int32_t to represent a signed integer [035/117] bfa: Convert to the scsi_status union [036/117] bnx2fc: Convert to the scsi_status union [037/117] cdrom: Convert to the scsi_status union [038/117] csiostor: Convert to the scsi_status union [039/117] cxlflash: Convert to the scsi_status union [040/117] dc395x: Use the set_{host,msg,status}_byte() functions [041/117] dc395x: Convert to the scsi_status union [042/117] dpt_i2o: Convert to the scsi_status union [043/117] esas2r: Convert to the scsi_status union [044/117] esp_scsi: Convert to the scsi_status union [045/117] fas216: Fix two source code comments [046/117] fas216: Convert to the scsi_status union [047/117] fc: Convert to the scsi_status union [048/117] fdomain: Convert to the scsi_status union [049/117] firewire: sbp2: Convert to the scsi_status union [050/117] fnic: Convert to the scsi_status union [051/117] hpsa: Convert to the scsi_status union [052/117] hptiop: Convert to the scsi_status union [053/117] ib_srp: Convert to the scsi_status union [054/117] ibmvfc: Fix the documentation of the return value of ibmvfc_host_chkready() [055/117] ibmvfc: Convert to the scsi_status union [056/117] ibmvscsi: Convert to the scsi_status union [057/117] ide: Convert to the scsi_status union [058/117] imm: Convert to the scsi_status union [059/117] initio: Convert to the scsi_status union [060/117] ipr: Convert to the scsi_status union [061/117] ips: Convert to the scsi_status union [062/117] iscsi: Convert to the scsi_status union [063/117] libfc: Convert to the scsi_status union [064/117] sas: Convert to the scsi_status union [065/117] lpfc: Convert to the scsi_status union [066/117] mac53c94: Convert to the scsi_status union [067/117] megaraid: Convert to the scsi_status union [068/117] mesh: Convert to the scsi_status union [069/117] message: fusion: Convert to the scsi_status union [070/117] mpt3sas: Convert to the scsi_status union [071/117] mvumi: Convert to the scsi_status union [072/117] myrb: Convert to the scsi_status union [073/117] myrs: Convert to the scsi_status union [074/117] ncr53c8xx: Convert to the scsi_status union [075/117] nfsd: Convert to the scsi_status union [076/117] nsp32: Convert to the scsi_status union [077/117] pcmcia: Convert to the scsi_status union [078/117] pktcdvd: Convert to the scsi_status union [079/117] pmcraid: Convert to the scsi_status union [080/117] ppa: Convert to the scsi_status union [081/117] ps3rom: Convert to the scsi_status union [082/117] qedf: Convert to the scsi_status union [083/117] qedi: Convert to the scsi_status union [084/117] qla1280: Convert to the scsi_status union [085/117] qla2xxx: Convert to the scsi_status union [086/117] qla4xxx: Convert to the scsi_status union [087/117] qlogicfas408: Convert to the scsi_status union [088/117] qlogicpti: Convert to the scsi_status union [089/117] s390/zfcp: Convert to the scsi_status union [090/117] scsi_debug: Convert to the scsi_status union [091/117] smartpqi: Convert to the scsi_status union [092/117] snic: Convert to the scsi_status union [093/117] staging: Convert to the scsi_status union [094/117] stex: Convert to the scsi_status union [095/117] storvsc: Convert to the scsi_status union [096/117] sym53c8xx_2: Convert to the scsi_status union [097/117] target: Convert to the scsi_status union [098/117] ufs: Remove an unused structure member [099/117] ufs: Remove a local variable [100/117] ufs: Use enum sam_status where appropriate [101/117] ufs: Remove an assignment from ufshcd_transfer_rsp_status() [102/117] ufs: Convert to the scsi_status union [103/117] usb: Convert to the scsi_status union [104/117] virtio-scsi: Convert to the scsi_status union [105/117] vmw_pvscsi: Convert to the scsi_status union [106/117] wd33c93: Convert to the scsi_status union [107/117] wd719x: Convert to the scsi_status union [108/117] xen-scsiback: Pass union status to the {status,msg,host,driver}_byte() macros [109/117] xen-scsifront: Convert to the scsi_status union [110/117] Finalize the switch from 'int' to 'union scsi_status' [111/117] Use the scsi_status union more widely [112/117] Change the return type of scsi_execute() into union scsi_status [113/117] Change the return type of scsi_execute_req() into union scsi_status [114/117] Change the return type of scsi_test_unit_ready() into union scsi_status [115/117] Change the return types of scsi_mode_sense() and sd_do_mode_sense() [116/117] Change the return type of scsi_mode_select() into union scsi_status [117/117] Change the return type of ioctl_internal_command() into union scsi_status

Message ID

20210420000845.25873-90-bvanassche@acm.org (mailing list archive)

State

Deferred

Headers

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>,
        Julian Wiedmann <jwi@linux.ibm.com>,
        Benjamin Block <bblock@linux.ibm.com>,
        Steffen Maier <maier@linux.ibm.com>
Subject: [PATCH 089/117] s390/zfcp: Convert to the scsi_status union
Date: Mon, 19 Apr 2021 17:08:17 -0700
Message-Id: <20210420000845.25873-90-bvanassche@acm.org>
In-Reply-To: <20210420000845.25873-1-bvanassche@acm.org>
References: <20210420000845.25873-1-bvanassche@acm.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Make better use of static type checking | expand

Commit Message

Bart Van Assche April 20, 2021, 12:08 a.m. UTC

An explanation of the purpose of this patch is available in the patch
"scsi: Introduce the scsi_status union".

Cc: Julian Wiedmann <jwi@linux.ibm.com>
Cc: Benjamin Block <bblock@linux.ibm.com>
Cc: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/s390/scsi/zfcp_dbf.c  | 2 +-
 drivers/s390/scsi/zfcp_dbf.h  | 2 +-
 drivers/s390/scsi/zfcp_fc.c   | 4 ++--
 drivers/s390/scsi/zfcp_fc.h   | 2 +-
 drivers/s390/scsi/zfcp_scsi.c | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index ca473b368905..6ea31ab9ccb0 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -643,7 +643,7 @@  void zfcp_dbf_scsi_common(char *tag, int level, struct scsi_device *sdev,
 	memcpy(rec->tag, tag, ZFCP_DBF_TAG_LEN);
 	rec->id = ZFCP_DBF_SCSI_CMND;
 	if (sc) {
-		rec->scsi_result = sc->result;
+		rec->scsi_result = sc->status.combined;
 		rec->scsi_retries = sc->retries;
 		rec->scsi_allowed = sc->allowed;
 		rec->scsi_id = sc->device->id;
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h
index 4d1435c573bc..190ad0127db1 100644
--- a/drivers/s390/scsi/zfcp_dbf.h
+++ b/drivers/s390/scsi/zfcp_dbf.h
@@ -402,7 +402,7 @@  void _zfcp_dbf_scsi(char *tag, int level, struct scsi_cmnd *scmd,
 static inline
 void zfcp_dbf_scsi_result(struct scsi_cmnd *scmd, struct zfcp_fsf_req *req)
 {
-	if (scmd->result != 0)
+	if (scmd->status.combined != 0)
 		_zfcp_dbf_scsi("rsl_err", 3, scmd, req);
 	else if (scmd->retries > 0)
 		_zfcp_dbf_scsi("rsl_ret", 4, scmd, req);
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index d24cafe02708..d896c0be8102 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -951,8 +951,8 @@  static void zfcp_fc_ct_els_job_handler(void *data)
 
 	jr->reply_payload_rcv_len = job->reply_payload.payload_len;
 	jr->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;
-	jr->result = zfcp_ct_els->status ? -EIO : 0;
-	bsg_job_done(job, jr->result, jr->reply_payload_rcv_len);
+	jr->status.combined = zfcp_ct_els->status ? -EIO : 0;
+	bsg_job_done(job, jr->status.combined, jr->reply_payload_rcv_len);
 }
 
 static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct bsg_job *job)
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h
index 8aaf409ce9cb..7f494cbaeab0 100644
--- a/drivers/s390/scsi/zfcp_fc.h
+++ b/drivers/s390/scsi/zfcp_fc.h
@@ -275,7 +275,7 @@  void zfcp_fc_eval_fcp_rsp(struct fcp_resp_with_ext *fcp_rsp,
 	u32 sense_len, resid;
 	u8 rsp_flags;
 
-	scsi->result |= fcp_rsp->resp.fr_status;
+	scsi->status.combined |= fcp_rsp->resp.fr_status;
 
 	rsp_flags = fcp_rsp->resp.fr_flags;
 
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index d58bf79892f2..1d7bc73c3d31 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -71,12 +71,12 @@  int zfcp_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scpnt)
 	int    status, scsi_result, ret;
 
 	/* reset the status for this request */
-	scpnt->result = 0;
+	scpnt->status.combined = 0;
 	scpnt->host_scribble = NULL;
 
 	scsi_result = fc_remote_port_chkready(rport);
 	if (unlikely(scsi_result)) {
-		scpnt->result = scsi_result;
+		scpnt->status.combined = scsi_result;
 		zfcp_dbf_scsi_fail_send(scpnt);
 		scpnt->scsi_done(scpnt);
 		return 0;
@@ -859,7 +859,7 @@  void zfcp_scsi_dif_sense_error(struct scsi_cmnd *scmd, int ascq)
 	scsi_build_sense_buffer(1, scmd->sense_buffer,
 				ILLEGAL_REQUEST, 0x10, ascq);
 	set_driver_byte(scmd, DRIVER_SENSE);
-	scmd->result |= SAM_STAT_CHECK_CONDITION;
+	scmd->status.combined |= SAM_STAT_CHECK_CONDITION;
 	set_host_byte(scmd, DID_SOFT_ERROR);
 }

[089/117] s390/zfcp: Convert to the scsi_status union

Commit Message

Patch