[067/117] megaraid: Convert to the scsi_status union

Message ID	20210420000845.25873-68-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>, Kashyap Desai <kashyap.desai@broadcom.com>, Sumit Saxena <sumit.saxena@broadcom.com>, Shivasharan S <shivasharan.srikanteshwara@broadcom.com> Subject: [PATCH 067/117] megaraid: Convert to the scsi_status union Date: Mon, 19 Apr 2021 17:07:55 -0700 Message-Id: <20210420000845.25873-68-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

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 80f546976c7e..49d072147242 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -585,7 +585,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) /* have just LUN 0 for each target on virtual channels */ if (cmd->device->lun) { - cmd->result = (DID_BAD_TARGET << 16); + cmd->status.combined = (DID_BAD_TARGET << 16); cmd->scsi_done(cmd); return NULL; } @@ -604,7 +604,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) max_ldrv_num += 0x80; if(ldrv_num > max_ldrv_num ) { - cmd->result = (DID_BAD_TARGET << 16); + cmd->status.combined = (DID_BAD_TARGET << 16); cmd->scsi_done(cmd); return NULL; } @@ -616,7 +616,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) * Do not support lun >7 for physically accessed * devices */ - cmd->result = (DID_BAD_TARGET << 16); + cmd->status.combined = (DID_BAD_TARGET << 16); cmd->scsi_done(cmd); return NULL; } @@ -636,7 +636,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) * If no, return success always */ if( !adapter->has_cluster ) { - cmd->result = (DID_OK << 16); + cmd->status.combined = (DID_OK << 16); cmd->scsi_done(cmd); return NULL; } @@ -654,7 +654,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) return scb; #else - cmd->result = (DID_OK << 16); + cmd->status.combined = (DID_OK << 16); cmd->scsi_done(cmd); return NULL; #endif @@ -669,7 +669,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) memset(buf, 0, cmd->cmnd[4]); kunmap_atomic(buf - sg->offset); - cmd->result = (DID_OK << 16); + cmd->status.combined = (DID_OK << 16); cmd->scsi_done(cmd); return NULL; } @@ -865,7 +865,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) */ if( ! adapter->has_cluster ) { - cmd->result = (DID_BAD_TARGET << 16); + cmd->status.combined = (DID_BAD_TARGET << 16); cmd->scsi_done(cmd); return NULL; } @@ -888,7 +888,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) #endif default: - cmd->result = (DID_BAD_TARGET << 16); + cmd->status.combined = (DID_BAD_TARGET << 16); cmd->scsi_done(cmd); return NULL; } @@ -1472,7 +1472,7 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) "aborted cmd [%x] complete\n", scb->idx); - scb->cmd->result = (DID_ABORT << 16); + scb->cmd->status.combined = (DID_ABORT << 16); list_add_tail(SCSI_LIST(scb->cmd), &adapter->completed_list); @@ -1491,7 +1491,7 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) "reset cmd [%x] complete\n", scb->idx); - scb->cmd->result = (DID_RESET << 16); + scb->cmd->status.combined = (DID_RESET << 16); list_add_tail(SCSI_LIST(scb->cmd), &adapter->completed_list); @@ -1565,12 +1565,12 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) } /* clear result; otherwise, success returns corrupt value */ - cmd->result = 0; + cmd->status.combined = 0; /* Convert MegaRAID status to Linux error code */ switch (status) { case 0x00: /* SUCCESS , i.e. SCSI_STATUS_GOOD */ - cmd->result |= (DID_OK << 16); + cmd->status.combined |= (DID_OK << 16); break; case 0x02: /* ERROR_ABORTED, i.e. @@ -1583,9 +1583,9 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) memcpy(cmd->sense_buffer, pthru->reqsensearea, 14); - cmd->result = (DRIVER_SENSE << 24) | + cmd->status.combined = (DRIVER_SENSE << 24) | (DID_OK << 16) | - (CHECK_CONDITION << 1); + SAM_STAT_CHECK_CONDITION; } else { if (mbox->m_out.cmd == MEGA_MBOXCMD_EXTPTHRU) { @@ -1593,20 +1593,20 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) memcpy(cmd->sense_buffer, epthru->reqsensearea, 14); - cmd->result = (DRIVER_SENSE << 24) | + cmd->status.combined = (DRIVER_SENSE << 24) | (DID_OK << 16) | - (CHECK_CONDITION << 1); + SAM_STAT_CHECK_CONDITION; } else { cmd->sense_buffer[0] = 0x70; cmd->sense_buffer[2] = ABORTED_COMMAND; - cmd->result |= (CHECK_CONDITION << 1); + cmd->status.b.status = SAM_STAT_CHECK_CONDITION; } } break; case 0x08: /* ERR_DEST_DRIVE_FAILED, i.e. SCSI_STATUS_BUSY */ - cmd->result |= (DID_BUS_BUSY << 16) | status; + cmd->status.combined |= (DID_BUS_BUSY << 16) | status; break; default: @@ -1616,8 +1616,8 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) * MEGA_RESERVATION_STATUS failed */ if( cmd->cmnd[0] == TEST_UNIT_READY ) { - cmd->result |= (DID_ERROR << 16) | - (RESERVATION_CONFLICT << 1); + cmd->status.combined |= (DID_ERROR << 16) | + SAM_STAT_RESERVATION_CONFLICT; } else /* @@ -1628,12 +1628,12 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) (cmd->cmnd[0] == RESERVE || cmd->cmnd[0] == RELEASE) ) { - cmd->result |= (DID_ERROR << 16) | - (RESERVATION_CONFLICT << 1); + cmd->status.combined |= (DID_ERROR << 16) | + SAM_STAT_RESERVATION_CONFLICT; } else #endif - cmd->result |= (DID_BAD_TARGET << 16)|status; + cmd->status.combined |= (DID_BAD_TARGET << 16)|status; } mega_free_scb(adapter, scb); @@ -1983,10 +1983,10 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor) mega_free_scb(adapter, scb); if( aor == SCB_ABORT ) { - cmd->result = (DID_ABORT << 16); + cmd->status.combined = (DID_ABORT << 16); } else { - cmd->result = (DID_RESET << 16); + cmd->status.combined = (DID_RESET << 16); } list_add_tail(SCSI_LIST(cmd), diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index b1a2d3536add..b819365249ea 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c @@ -1442,7 +1442,7 @@ megaraid_queue_command_lck(struct scsi_cmnd *scp, void (*done)(struct scsi_cmnd adapter = SCP2ADAPTER(scp); scp->scsi_done = done; - scp->result = 0; + scp->status.combined = 0; /* * Allocate and build a SCB request @@ -1510,12 +1510,12 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) * If no, return success always */ if (!adapter->ha) { - scp->result = (DID_OK << 16); + scp->status.combined = (DID_OK << 16); return NULL; } if (!(scb = megaraid_alloc_scb(adapter, scp))) { - scp->result = (DID_ERROR << 16); + scp->status.combined = (DID_ERROR << 16); *busy = 1; return NULL; } @@ -1552,7 +1552,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) __LINE__)); } } - scp->result = (DID_OK << 16); + scp->status.combined = (DID_OK << 16); return NULL; case INQUIRY: @@ -1577,7 +1577,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) scp->sense_buffer[0] = 0x70; scp->sense_buffer[2] = ILLEGAL_REQUEST; scp->sense_buffer[12] = MEGA_INVALID_FIELD_IN_CDB; - scp->result = CHECK_CONDITION << 1; + scp->status.combined = SAM_STAT_CHECK_CONDITION; return NULL; } @@ -1589,18 +1589,18 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) * requests for more than 40 logical drives */ if (SCP2LUN(scp)) { - scp->result = (DID_BAD_TARGET << 16); + scp->status.combined = (DID_BAD_TARGET << 16); return NULL; } if ((target % 0x80) >= MAX_LOGICAL_DRIVES_40LD) { - scp->result = (DID_BAD_TARGET << 16); + scp->status.combined = (DID_BAD_TARGET << 16); return NULL; } /* Allocate a SCB and initialize passthru */ if (!(scb = megaraid_alloc_scb(adapter, scp))) { - scp->result = (DID_ERROR << 16); + scp->status.combined = (DID_ERROR << 16); *busy = 1; return NULL; } @@ -1645,7 +1645,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) * Allocate a SCB and initialize mailbox */ if (!(scb = megaraid_alloc_scb(adapter, scp))) { - scp->result = (DID_ERROR << 16); + scp->status.combined = (DID_ERROR << 16); *busy = 1; return NULL; } @@ -1712,7 +1712,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) megaraid_dealloc_scb(adapter, scb); - scp->result = (DID_ERROR << 16); + scp->status.combined = (DID_ERROR << 16); return NULL; } @@ -1733,7 +1733,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) * Do we support clustering and is the support enabled */ if (!adapter->ha) { - scp->result = (DID_BAD_TARGET << 16); + scp->status.combined = (DID_BAD_TARGET << 16); return NULL; } @@ -1741,7 +1741,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) * Allocate a SCB and initialize mailbox */ if (!(scb = megaraid_alloc_scb(adapter, scp))) { - scp->result = (DID_ERROR << 16); + scp->status.combined = (DID_ERROR << 16); *busy = 1; return NULL; } @@ -1759,7 +1759,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) return scb; default: - scp->result = (DID_BAD_TARGET << 16); + scp->status.combined = (DID_BAD_TARGET << 16); return NULL; } } @@ -1767,7 +1767,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) // Do not allow access to target id > 15 or LUN > 7 if (target > 15 || SCP2LUN(scp) > 7) { - scp->result = (DID_BAD_TARGET << 16); + scp->status.combined = (DID_BAD_TARGET << 16); return NULL; } @@ -1803,13 +1803,13 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy) // disable channel sweep if fast load option given if (rdev->fast_load) { - scp->result = (DID_BAD_TARGET << 16); + scp->status.combined = (DID_BAD_TARGET << 16); return NULL; } // Allocate a SCB and initialize passthru if (!(scb = megaraid_alloc_scb(adapter, scp))) { - scp->result = (DID_ERROR << 16); + scp->status.combined = (DID_ERROR << 16); *busy = 1; return NULL; } @@ -2289,7 +2289,7 @@ megaraid_mbox_dpc(unsigned long devp) case 0x00: - scp->result = (DID_OK << 16); + scp->status.combined = (DID_OK << 16); break; case 0x02: @@ -2301,8 +2301,8 @@ megaraid_mbox_dpc(unsigned long devp) memcpy(scp->sense_buffer, pthru->reqsensearea, 14); - scp->result = DRIVER_SENSE << 24 | - DID_OK << 16 | CHECK_CONDITION << 1; + scp->status.combined = DRIVER_SENSE << 24 | + DID_OK << 16 | SAM_STAT_CHECK_CONDITION; } else { if (mbox->cmd == MBOXCMD_EXTPTHRU) { @@ -2310,20 +2310,20 @@ megaraid_mbox_dpc(unsigned long devp) memcpy(scp->sense_buffer, epthru->reqsensearea, 14); - scp->result = DRIVER_SENSE << 24 | + scp->status.combined = DRIVER_SENSE << 24 | DID_OK << 16 | - CHECK_CONDITION << 1; + SAM_STAT_CHECK_CONDITION; } else { scp->sense_buffer[0] = 0x70; scp->sense_buffer[2] = ABORTED_COMMAND; - scp->result = CHECK_CONDITION << 1; + scp->status.combined = SAM_STAT_CHECK_CONDITION; } } break; case 0x08: - scp->result = DID_BUS_BUSY << 16 | status; + scp->status.combined = DID_BUS_BUSY << 16 | status; break; default: @@ -2333,8 +2333,8 @@ megaraid_mbox_dpc(unsigned long devp) * failed */ if (scp->cmnd[0] == TEST_UNIT_READY) { - scp->result = DID_ERROR << 16 | - RESERVATION_CONFLICT << 1; + scp->status.combined = DID_ERROR << 16 | + SAM_STAT_RESERVATION_CONFLICT; } else /* @@ -2344,11 +2344,11 @@ megaraid_mbox_dpc(unsigned long devp) if (status == 1 && (scp->cmnd[0] == RESERVE || scp->cmnd[0] == RELEASE)) { - scp->result = DID_ERROR << 16 | - RESERVATION_CONFLICT << 1; + scp->status.combined = DID_ERROR << 16 | + SAM_STAT_RESERVATION_CONFLICT; } else { - scp->result = DID_BAD_TARGET << 16 | status; + scp->status.combined = DID_BAD_TARGET << 16 | status; } } @@ -2423,7 +2423,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp) "megaraid: %d[%d:%d], abort from completed list\n", scb->sno, scb->dev_channel, scb->dev_target)); - scp->result = (DID_ABORT << 16); + scp->status.combined = (DID_ABORT << 16); scp->scsi_done(scp); megaraid_dealloc_scb(adapter, scb); @@ -2453,7 +2453,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp) "megaraid abort: [%d:%d], driver owner\n", scb->dev_channel, scb->dev_target)); - scp->result = (DID_ABORT << 16); + scp->status.combined = (DID_ABORT << 16); scp->scsi_done(scp); megaraid_dealloc_scb(adapter, scb); @@ -2573,7 +2573,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp) scb->sno, scb->dev_channel, scb->dev_target)); } - scb->scp->result = (DID_RESET << 16); + scb->scp->status.combined = (DID_RESET << 16); scb->scp->scsi_done(scb->scp); megaraid_dealloc_scb(adapter, scb); diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 4d4e9dbe5193..218c38b54be1 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -1784,7 +1784,7 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd) scmd->device->host->hostdata; if (instance->unload == 1) { - scmd->result = DID_NO_CONNECT << 16; + scmd->status.combined = DID_NO_CONNECT << 16; scmd->scsi_done(scmd); return 0; } @@ -1799,21 +1799,21 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd) (DID_REQUEUE << 16)) { return SCSI_MLQUEUE_HOST_BUSY; } else { - scmd->result = DID_NO_CONNECT << 16; + scmd->status.combined = DID_NO_CONNECT << 16; scmd->scsi_done(scmd); return 0; } } if (atomic_read(&instance->adprecovery) == MEGASAS_HW_CRITICAL_ERROR) { - scmd->result = DID_NO_CONNECT << 16; + scmd->status.combined = DID_NO_CONNECT << 16; scmd->scsi_done(scmd); return 0; } mr_device_priv_data = scmd->device->hostdata; if (!mr_device_priv_data) { - scmd->result = DID_NO_CONNECT << 16; + scmd->status.combined = DID_NO_CONNECT << 16; scmd->scsi_done(scmd); return 0; } @@ -1825,19 +1825,19 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd) return SCSI_MLQUEUE_DEVICE_BUSY; - scmd->result = 0; + scmd->status.combined = 0; if (MEGASAS_IS_LOGICAL(scmd->device) && (scmd->device->id >= instance->fw_supported_vd_count || scmd->device->lun)) { - scmd->result = DID_BAD_TARGET << 16; + scmd->status.combined = DID_BAD_TARGET << 16; goto out_done; } if ((scmd->cmnd[0] == SYNCHRONIZE_CACHE) && MEGASAS_IS_LOGICAL(scmd->device) && (!instance->fw_sync_cache_support)) { - scmd->result = DID_OK << 16; + scmd->status.combined = DID_OK << 16; goto out_done; } @@ -2744,7 +2744,7 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance) struct megasas_cmd, list); list_del_init(&reset_cmd->list); if (reset_cmd->scmd) { - reset_cmd->scmd->result = DID_REQUEUE << 16; + reset_cmd->scmd->status.combined = DID_REQUEUE << 16; dev_notice(&instance->pdev->dev, "%d:%p reset [%02x]\n", reset_index, reset_cmd, reset_cmd->scmd->cmnd[0]); @@ -3581,7 +3581,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, case MFI_CMD_LD_WRITE: if (alt_status) { - cmd->scmd->result = alt_status << 16; + cmd->scmd->status.combined = alt_status << 16; exception = 1; } @@ -3599,18 +3599,18 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, switch (hdr->cmd_status) { case MFI_STAT_OK: - cmd->scmd->result = DID_OK << 16; + cmd->scmd->status.combined = DID_OK << 16; break; case MFI_STAT_SCSI_IO_FAILED: case MFI_STAT_LD_INIT_IN_PROGRESS: - cmd->scmd->result = + cmd->scmd->status.combined = (DID_ERROR << 16) | hdr->scsi_status; break; case MFI_STAT_SCSI_DONE_WITH_ERROR: - cmd->scmd->result = (DID_OK << 16) | hdr->scsi_status; + cmd->scmd->status.combined = (DID_OK << 16) | hdr->scsi_status; if (hdr->scsi_status == SAM_STAT_CHECK_CONDITION) { memset(cmd->scmd->sense_buffer, 0, @@ -3618,20 +3618,20 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, memcpy(cmd->scmd->sense_buffer, cmd->sense, hdr->sense_len); - cmd->scmd->result |= DRIVER_SENSE << 24; + cmd->scmd->status.combined |= DRIVER_SENSE << 24; } break; case MFI_STAT_LD_OFFLINE: case MFI_STAT_DEVICE_NOT_FOUND: - cmd->scmd->result = DID_BAD_TARGET << 16; + cmd->scmd->status.combined = DID_BAD_TARGET << 16; break; default: dev_printk(KERN_DEBUG, &instance->pdev->dev, "MFI FW status %#x\n", hdr->cmd_status); - cmd->scmd->result = DID_ERROR << 16; + cmd->scmd->status.combined = DID_ERROR << 16; break; } diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 2221175ae051..c70e7ce72123 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -2035,23 +2035,23 @@ map_cmd_status(struct fusion_context *fusion, switch (status) { case MFI_STAT_OK: - scmd->result = DID_OK << 16; + scmd->status.combined = DID_OK << 16; break; case MFI_STAT_SCSI_IO_FAILED: case MFI_STAT_LD_INIT_IN_PROGRESS: - scmd->result = (DID_ERROR << 16) | ext_status; + scmd->status.combined = (DID_ERROR << 16) | ext_status; break; case MFI_STAT_SCSI_DONE_WITH_ERROR: - scmd->result = (DID_OK << 16) | ext_status; + scmd->status.combined = (DID_OK << 16) | ext_status; if (ext_status == SAM_STAT_CHECK_CONDITION) { memset(scmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); memcpy(scmd->sense_buffer, sense, SCSI_SENSE_BUFFERSIZE); - scmd->result |= DRIVER_SENSE << 24; + scmd->status.combined |= DRIVER_SENSE << 24; } /* @@ -2073,13 +2073,13 @@ map_cmd_status(struct fusion_context *fusion, case MFI_STAT_LD_OFFLINE: case MFI_STAT_DEVICE_NOT_FOUND: - scmd->result = DID_BAD_TARGET << 16; + scmd->status.combined = DID_BAD_TARGET << 16; break; case MFI_STAT_CONFIG_SEQ_MISMATCH: - scmd->result = DID_IMM_RETRY << 16; + scmd->status.combined = DID_IMM_RETRY << 16; break; default: - scmd->result = DID_ERROR << 16; + scmd->status.combined = DID_ERROR << 16; break; } } @@ -4699,7 +4699,7 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd) if (!mr_device_priv_data) { sdev_printk(KERN_INFO, scmd->device, "device been deleted! " "scmd(%p)\n", scmd); - scmd->result = DID_NO_CONNECT << 16; + scmd->status.combined = DID_NO_CONNECT << 16; ret = SUCCESS; goto out; } @@ -4780,7 +4780,7 @@ int megasas_reset_target_fusion(struct scsi_cmnd *scmd) if (!mr_device_priv_data) { sdev_printk(KERN_INFO, scmd->device, "device been deleted! scmd: (0x%p)\n", scmd); - scmd->result = DID_NO_CONNECT << 16; + scmd->status.combined = DID_NO_CONNECT << 16; ret = SUCCESS; goto out; } @@ -4959,7 +4959,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int reason) MPI2_FUNCTION_SCSI_IO_REQUEST) fpio_count++; - scmd_local->result = + scmd_local->status.combined = megasas_check_mpio_paths(instance, scmd_local); if (instance->ldio_threshold &&

[067/117] megaraid: Convert to the scsi_status union

Commit Message

Patch