[024/117] aacraid: Convert to the scsi_status union

Message ID	20210420000845.25873-25-bvanassche@acm.org
State	New
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>, Adaptec OEM Raid Solutions <aacraid@microsemi.com> Subject: [PATCH 024/117] aacraid: Convert to the scsi_status union Date: Mon, 19 Apr 2021 17:07:12 -0700 Message-Id: <20210420000845.25873-25-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 [002/117] Introduce enums for the SAM, message, host and driver status codes [004/117] libiscsi: Use the host_status enum [006/117] target: Use enum sam_status instead of u8 [007/117] lpfc: Reformat four comparisons [010/117] ufs: Add a compile-time structure size check [012/117] block: Convert SCSI and bsg code to the scsi_status union [013/117] core: Convert to the scsi_status union [017/117] st: Convert to the scsi_status union [018/117] sg: Convert to the scsi_status union [020/117] 53c700: Convert to the scsi_status union [022/117] NCR5380: Convert to the scsi_status union [024/117] aacraid: Convert to the scsi_status union [027/117] advansys: Convert to the scsi_status union [028/117] aha*: Convert to the scsi_status union [030/117] arcmsr: Convert to the scsi_status union [032/117] atp870u: Convert to the scsi_status union [034/117] bfa: Use type int32_t to represent a signed integer [036/117] bnx2fc: 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 [042/117] dpt_i2o: Convert to the scsi_status union [043/117] esas2r: Convert to the scsi_status union [046/117] fas216: Convert to the scsi_status union [048/117] fdomain: Convert to the scsi_status union [050/117] fnic: Convert to the scsi_status union [052/117] hptiop: Convert to the scsi_status union [054/117] ibmvfc: Fix the documentation of the return value of ibmvfc_host_chkready() [056/117] ibmvscsi: Convert to the scsi_status union [058/117] imm: Convert to the scsi_status union [060/117] ipr: Convert to the scsi_status union [062/117] iscsi: Convert to the scsi_status union [064/117] sas: Convert to the scsi_status union [065/117] lpfc: Convert to the scsi_status union [068/117] mesh: Convert to the scsi_status union [070/117] mpt3sas: Convert to the scsi_status union [072/117] myrb: Convert to the scsi_status union [074/117] ncr53c8xx: Convert to the scsi_status union [075/117] nfsd: Convert to the scsi_status union [077/117] pcmcia: Convert to the scsi_status union [081/117] ps3rom: Convert to the scsi_status union [082/117] qedf: Convert to the scsi_status union [084/117] qla1280: Convert to the scsi_status union [086/117] qla4xxx: Convert to the scsi_status union [088/117] qlogicpti: 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 [093/117] staging: Convert to the scsi_status union [095/117] storvsc: Convert to the scsi_status union [097/117] target: Convert to the scsi_status union [100/117] ufs: Use enum sam_status where appropriate [101/117] ufs: Remove an assignment from ufshcd_transfer_rsp_status() [103/117] usb: Convert to the scsi_status union [105/117] vmw_pvscsi: 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 [111/117] Use the scsi_status union more widely [113/117] Change the return type of scsi_execute_req() into union scsi_status [115/117] Change the return types of scsi_mode_sense() and sd_do_mode_sense() [117/117] Change the return type of ioctl_internal_command() into union scsi_status

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index f1f62b5da8b7..a70b243990d5 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -556,7 +556,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr) } } - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; aac_fib_complete(fibptr); scsicmd->scsi_done(scsicmd); @@ -614,7 +614,7 @@ static int aac_probe_container_callback2(struct scsi_cmnd * scsicmd) if ((fsa_dev_ptr[scmd_id(scsicmd)].valid & 1)) return aac_scsi_cmd(scsicmd); - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; scsicmd->scsi_done(scsicmd); return 0; } @@ -1092,7 +1092,7 @@ static void get_container_serial_callback(void *context, struct fib * fibptr) } } - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; aac_fib_complete(fibptr); scsicmd->scsi_done(scsicmd); @@ -1191,7 +1191,7 @@ static int aac_bounds_32(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba) if (lba & 0xffffffff00000000LL) { int cid = scmd_id(cmd); dprintk((KERN_DEBUG "aacraid: Illegal lba\n")); - cmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + cmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE, ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); @@ -2358,11 +2358,11 @@ static void io_callback(void *context, struct fib * fibptr) readreply = (struct aac_read_reply *)fib_data(fibptr); switch (le32_to_cpu(readreply->status)) { case ST_OK: - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; dev->fsa_dev[cid].sense_data.sense_key = NO_SENSE; break; case ST_NOT_READY: - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, NOT_READY, SENCODE_BECOMING_READY, ASENCODE_BECOMING_READY, 0, 0); memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data, @@ -2370,7 +2370,7 @@ static void io_callback(void *context, struct fib * fibptr) SCSI_SENSE_BUFFERSIZE)); break; case ST_MEDERR: - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, MEDIUM_ERROR, SENCODE_UNRECOVERED_READ_ERROR, ASENCODE_NO_SENSE, 0, 0); memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data, @@ -2382,7 +2382,7 @@ static void io_callback(void *context, struct fib * fibptr) printk(KERN_WARNING "io_callback: io failed, status = %d\n", le32_to_cpu(readreply->status)); #endif - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE, ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); @@ -2457,7 +2457,7 @@ static int aac_read(struct scsi_cmnd * scsicmd) if ((lba + count) > (dev->fsa_dev[scmd_id(scsicmd)].size)) { cid = scmd_id(scsicmd); dprintk((KERN_DEBUG "aacraid: Illegal lba\n")); - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, ILLEGAL_REQUEST, SENCODE_LBA_OUT_OF_RANGE, ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); @@ -2489,7 +2489,7 @@ static int aac_read(struct scsi_cmnd * scsicmd) /* * For some reason, the Fib didn't queue, return QUEUE_FULL */ - scsicmd->result = DID_OK << 16 | SAM_STAT_TASK_SET_FULL; + scsicmd->status.combined = SAM_STAT_TASK_SET_FULL; scsicmd->scsi_done(scsicmd); aac_fib_complete(cmd_fibcontext); aac_fib_free(cmd_fibcontext); @@ -2548,7 +2548,7 @@ static int aac_write(struct scsi_cmnd * scsicmd) if ((lba + count) > (dev->fsa_dev[scmd_id(scsicmd)].size)) { cid = scmd_id(scsicmd); dprintk((KERN_DEBUG "aacraid: Illegal lba\n")); - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, ILLEGAL_REQUEST, SENCODE_LBA_OUT_OF_RANGE, ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); @@ -2580,7 +2580,7 @@ static int aac_write(struct scsi_cmnd * scsicmd) /* * For some reason, the Fib didn't queue, return QUEUE_FULL */ - scsicmd->result = DID_OK << 16 | SAM_STAT_TASK_SET_FULL; + scsicmd->status.combined = SAM_STAT_TASK_SET_FULL; scsicmd->scsi_done(scsicmd); aac_fib_complete(cmd_fibcontext); @@ -2603,7 +2603,7 @@ static void synchronize_callback(void *context, struct fib *fibptr) synchronizereply = fib_data(fibptr); if (le32_to_cpu(synchronizereply->status) == CT_OK) - cmd->result = DID_OK << 16 | SAM_STAT_GOOD; + cmd->status.combined = SAM_STAT_GOOD; else { struct scsi_device *sdev = cmd->device; struct aac_dev *dev = fibptr->dev; @@ -2611,7 +2611,7 @@ static void synchronize_callback(void *context, struct fib *fibptr) printk(KERN_WARNING "synchronize_callback: synchronize failed, status = %d\n", le32_to_cpu(synchronizereply->status)); - cmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + cmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE, ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); @@ -2685,7 +2685,7 @@ static void aac_start_stop_callback(void *context, struct fib *fibptr) BUG_ON(fibptr == NULL); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; aac_fib_complete(fibptr); aac_fib_free(fibptr); @@ -2702,7 +2702,7 @@ static int aac_start_stop(struct scsi_cmnd *scsicmd) if (!(aac->supplement_adapter_info.supported_options2 & AAC_OPTION_POWER_MANAGEMENT)) { - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; scsicmd->scsi_done(scsicmd); return 0; } @@ -2777,7 +2777,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) if (scmd_channel(scsicmd) == CONTAINER_CHANNEL) { if((cid >= dev->maximum_num_containers) || (scsicmd->device->lun != 0)) { - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; goto scsi_done_ret; } @@ -2821,7 +2821,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) return -1; return aac_send_srb_fib(scsicmd); } else { - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; goto scsi_done_ret; } } @@ -2833,7 +2833,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) (scsicmd->cmnd[0] != TEST_UNIT_READY)) { dprintk((KERN_WARNING "Only INQUIRY & TUR command supported for controller, rcvd = 0x%x.\n", scsicmd->cmnd[0])); - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND, ASENCODE_INVALID_COMMAND, 0, 0); @@ -2862,7 +2862,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) case SYNCHRONIZE_CACHE: if (((aac_cache & 6) == 6) && dev->cache_protected) { - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; } /* Issue FIB to tell Firmware to flush it's cache */ @@ -2891,7 +2891,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) arr[1] = scsicmd->cmnd[2]; scsi_sg_copy_from_buffer(scsicmd, &inq_data, sizeof(inq_data)); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; } else if (scsicmd->cmnd[2] == 0x80) { /* unit serial number page */ arr[3] = setinqserial(dev, &arr[4], @@ -2902,7 +2902,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) if (aac_wwn != 2) return aac_get_container_serial( scsicmd); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; } else if (scsicmd->cmnd[2] == 0x83) { /* vpd page 0x83 - Device Identification Page */ char *sno = (char *)&inq_data; @@ -2911,10 +2911,10 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) if (aac_wwn != 2) return aac_get_container_serial( scsicmd); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; } else { /* vpd page not implemented */ - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, ILLEGAL_REQUEST, SENCODE_INVALID_CDB_FIELD, ASENCODE_NO_SENSE, 7, 2); @@ -2940,7 +2940,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) inq_data.inqd_pdt = INQD_PDT_PROC; /* Processor device */ scsi_sg_copy_from_buffer(scsicmd, &inq_data, sizeof(inq_data)); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; } if (dev->in_reset) @@ -2989,7 +2989,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) /* Do not cache partition table for arrays */ scsicmd->device->removable = 1; - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; } @@ -3015,7 +3015,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) scsi_sg_copy_from_buffer(scsicmd, cp, sizeof(cp)); /* Do not cache partition table for arrays */ scsicmd->device->removable = 1; - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; } @@ -3094,7 +3094,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) scsi_sg_copy_from_buffer(scsicmd, (char *)&mpd, mode_buf_length); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; } case MODE_SENSE_10: @@ -3171,7 +3171,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) (char *)&mpd10, mode_buf_length); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; } case REQUEST_SENSE: @@ -3180,7 +3180,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) sizeof(struct sense_data)); memset(&dev->fsa_dev[cid].sense_data, 0, sizeof(struct sense_data)); - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; case ALLOW_MEDIUM_REMOVAL: @@ -3190,14 +3190,14 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) else fsa_dev_ptr[cid].locked = 0; - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; /* * These commands are all No-Ops */ case TEST_UNIT_READY: if (fsa_dev_ptr[cid].sense_data.sense_key == NOT_READY) { - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, NOT_READY, SENCODE_BECOMING_READY, ASENCODE_BECOMING_READY, 0, 0); @@ -3214,7 +3214,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) case REZERO_UNIT: case REASSIGN_BLOCKS: case SEEK_10: - scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD; + scsicmd->status.combined = SAM_STAT_GOOD; break; case START_STOP: @@ -3226,7 +3226,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) */ dprintk((KERN_WARNING "Unhandled SCSI Command: 0x%x.\n", scsicmd->cmnd[0])); - scsicmd->result = DID_OK << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = SAM_STAT_CHECK_CONDITION; set_sense(&dev->fsa_dev[cid].sense_data, ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND, ASENCODE_INVALID_COMMAND, 0, 0); @@ -3407,7 +3407,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) le32_to_cpu(srbreply->status)); len = min_t(u32, le32_to_cpu(srbreply->sense_data_size), SCSI_SENSE_BUFFERSIZE); - scsicmd->result = DID_ERROR << 16 | SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined = DID_ERROR << 16 | SAM_STAT_CHECK_CONDITION; memcpy(scsicmd->sense_buffer, srbreply->sense_data, len); } @@ -3419,7 +3419,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) case SRB_STATUS_ERROR_RECOVERY: case SRB_STATUS_PENDING: case SRB_STATUS_SUCCESS: - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; break; case SRB_STATUS_DATA_OVERRUN: switch (scsicmd->cmnd[0]) { @@ -3436,52 +3436,52 @@ static void aac_srb_callback(void *context, struct fib * fibptr) pr_warn("aacraid: SCSI CMD underflow\n"); else pr_warn("aacraid: SCSI CMD Data Overrun\n"); - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; break; case INQUIRY: - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; break; default: - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; break; } break; case SRB_STATUS_ABORTED: - scsicmd->result = DID_ABORT << 16; + scsicmd->status.combined = DID_ABORT << 16; break; case SRB_STATUS_ABORT_FAILED: /* * Not sure about this one - but assuming the * hba was trying to abort for some reason */ - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; break; case SRB_STATUS_PARITY_ERROR: - scsicmd->result = DID_PARITY << 16; + scsicmd->status.combined = DID_PARITY << 16; break; case SRB_STATUS_NO_DEVICE: case SRB_STATUS_INVALID_PATH_ID: case SRB_STATUS_INVALID_TARGET_ID: case SRB_STATUS_INVALID_LUN: case SRB_STATUS_SELECTION_TIMEOUT: - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; break; case SRB_STATUS_COMMAND_TIMEOUT: case SRB_STATUS_TIMEOUT: - scsicmd->result = DID_TIME_OUT << 16; + scsicmd->status.combined = DID_TIME_OUT << 16; break; case SRB_STATUS_BUSY: - scsicmd->result = DID_BUS_BUSY << 16; + scsicmd->status.combined = DID_BUS_BUSY << 16; break; case SRB_STATUS_BUS_RESET: - scsicmd->result = DID_RESET << 16; + scsicmd->status.combined = DID_RESET << 16; break; case SRB_STATUS_MESSAGE_REJECTED: - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; break; case SRB_STATUS_REQUEST_FLUSHED: case SRB_STATUS_ERROR: @@ -3517,12 +3517,12 @@ static void aac_srb_callback(void *context, struct fib * fibptr) || (scsicmd->cmnd[0] == ATA_16)) { if (scsicmd->cmnd[2] & (0x01 << 5)) { - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; } else { - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; } } else { - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; } break; } @@ -3530,7 +3530,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) == SAM_STAT_CHECK_CONDITION) { int len; - scsicmd->result |= SAM_STAT_CHECK_CONDITION; + scsicmd->status.combined |= SAM_STAT_CHECK_CONDITION; len = min_t(u32, le32_to_cpu(srbreply->sense_data_size), SCSI_SENSE_BUFFERSIZE); #ifdef AAC_DETAILED_STATUS_INFO @@ -3544,7 +3544,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) /* * OR in the scsi status (already shifted up a bit) */ - scsicmd->result |= le32_to_cpu(srbreply->scsi_status); + scsicmd->status.combined |= le32_to_cpu(srbreply->scsi_status); aac_fib_complete(fibptr); scsicmd->scsi_done(scsicmd); @@ -3554,13 +3554,13 @@ static void hba_resp_task_complete(struct aac_dev *dev, struct scsi_cmnd *scsicmd, struct aac_hba_resp *err) { - scsicmd->result = err->status; + scsicmd->status.combined = err->status; /* set residual count */ scsi_set_resid(scsicmd, le32_to_cpu(err->residual_count)); switch (err->status) { case SAM_STAT_GOOD: - scsicmd->result |= DID_OK << 16; + scsicmd->status.combined |= 0; break; case SAM_STAT_CHECK_CONDITION: { @@ -3571,19 +3571,19 @@ static void hba_resp_task_complete(struct aac_dev *dev, if (len) memcpy(scsicmd->sense_buffer, err->sense_response_buf, len); - scsicmd->result |= DID_OK << 16; + scsicmd->status.combined |= 0; break; } case SAM_STAT_BUSY: - scsicmd->result |= DID_BUS_BUSY << 16; + scsicmd->status.combined |= DID_BUS_BUSY << 16; break; case SAM_STAT_TASK_ABORTED: - scsicmd->result |= DID_ABORT << 16; + scsicmd->status.combined |= DID_ABORT << 16; break; case SAM_STAT_RESERVATION_CONFLICT: case SAM_STAT_TASK_SET_FULL: default: - scsicmd->result |= DID_ERROR << 16; + scsicmd->status.combined |= DID_ERROR << 16; break; } } @@ -3603,26 +3603,26 @@ static void hba_resp_task_failure(struct aac_dev *dev, dev->hba_map[bus][cid].devtype = AAC_DEVTYPE_ARC_RAW; dev->hba_map[bus][cid].rmw_nexus = 0xffffffff; } - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; break; } case HBA_RESP_STAT_IO_ERROR: case HBA_RESP_STAT_NO_PATH_TO_DEVICE: - scsicmd->result = DID_OK << 16 | SAM_STAT_BUSY; + scsicmd->status.combined = SAM_STAT_BUSY; break; case HBA_RESP_STAT_IO_ABORTED: - scsicmd->result = DID_ABORT << 16; + scsicmd->status.combined = DID_ABORT << 16; break; case HBA_RESP_STAT_INVALID_DEVICE: - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; break; case HBA_RESP_STAT_UNDERRUN: /* UNDERRUN is OK */ - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; break; case HBA_RESP_STAT_OVERRUN: default: - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; break; } } @@ -3655,7 +3655,7 @@ void aac_hba_callback(void *context, struct fib *fibptr) if (fibptr->flags & FIB_CONTEXT_FLAG_FASTRESP) { /* fast response */ - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; goto out; } @@ -3667,17 +3667,17 @@ void aac_hba_callback(void *context, struct fib *fibptr) hba_resp_task_failure(dev, scsicmd, err); break; case HBA_RESP_SVCRES_TMF_REJECTED: - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; break; case HBA_RESP_SVCRES_TMF_LUN_INVALID: - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; break; case HBA_RESP_SVCRES_TMF_COMPLETE: case HBA_RESP_SVCRES_TMF_SUCCEEDED: - scsicmd->result = DID_OK << 16; + scsicmd->status.combined = 0; break; default: - scsicmd->result = DID_ERROR << 16; + scsicmd->status.combined = DID_ERROR << 16; break; } @@ -3706,7 +3706,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd) dev = (struct aac_dev *)scsicmd->device->host->hostdata; if (scmd_id(scsicmd) >= dev->maximum_num_physicals || scsicmd->device->lun > 7) { - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; scsicmd->scsi_done(scsicmd); return 0; } @@ -3747,7 +3747,7 @@ static int aac_send_hba_fib(struct scsi_cmnd *scsicmd) dev = shost_priv(scsicmd->device->host); if (scmd_id(scsicmd) >= dev->maximum_num_physicals || scsicmd->device->lun > AAC_MAX_LUN - 1) { - scsicmd->result = DID_NO_CONNECT << 16; + scsicmd->status.combined = DID_NO_CONNECT << 16; scsicmd->scsi_done(scsicmd); return 0; }

[024/117] aacraid: Convert to the scsi_status union

Commit Message

Patch