|
@@ -319,7 +319,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba,
|
|
|
|
|
|
/* Close the timeout handler abort window */
|
|
|
spin_lock_irqsave(&phba->hbalock, flags);
|
|
|
- cmdiocbq->iocb_aux_flag &= ~LPFC_IO_CMD_OUTSTANDING;
|
|
|
+ cmdiocbq->iocb_flag &= ~LPFC_IO_CMD_OUTSTANDING;
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
|
|
|
iocb = &dd_data->context_un.iocb;
|
|
@@ -513,7 +513,7 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job)
|
|
|
/* make sure the I/O had not been completed yet */
|
|
|
if (cmdiocbq->iocb_flag & LPFC_IO_LIBDFC) {
|
|
|
/* open up abort window to timeout handler */
|
|
|
- cmdiocbq->iocb_aux_flag |= LPFC_IO_CMD_OUTSTANDING;
|
|
|
+ cmdiocbq->iocb_flag |= LPFC_IO_CMD_OUTSTANDING;
|
|
|
}
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
return 0; /* done for now */
|
|
@@ -595,7 +595,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba,
|
|
|
|
|
|
/* Close the timeout handler abort window */
|
|
|
spin_lock_irqsave(&phba->hbalock, flags);
|
|
|
- cmdiocbq->iocb_aux_flag &= ~LPFC_IO_CMD_OUTSTANDING;
|
|
|
+ cmdiocbq->iocb_flag &= ~LPFC_IO_CMD_OUTSTANDING;
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
|
|
|
rsp = &rspiocbq->iocb;
|
|
@@ -748,7 +748,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
|
|
|
/* make sure the I/O had not been completed/released */
|
|
|
if (cmdiocbq->iocb_flag & LPFC_IO_LIBDFC) {
|
|
|
/* open up abort window to timeout handler */
|
|
|
- cmdiocbq->iocb_aux_flag |= LPFC_IO_CMD_OUTSTANDING;
|
|
|
+ cmdiocbq->iocb_flag |= LPFC_IO_CMD_OUTSTANDING;
|
|
|
}
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
return 0; /* done for now */
|
|
@@ -1404,7 +1404,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba,
|
|
|
|
|
|
/* Close the timeout handler abort window */
|
|
|
spin_lock_irqsave(&phba->hbalock, flags);
|
|
|
- cmdiocbq->iocb_aux_flag &= ~LPFC_IO_CMD_OUTSTANDING;
|
|
|
+ cmdiocbq->iocb_flag &= ~LPFC_IO_CMD_OUTSTANDING;
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
|
|
|
ndlp = dd_data->context_un.iocb.ndlp;
|
|
@@ -1585,7 +1585,7 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag,
|
|
|
/* make sure the I/O had not been completed/released */
|
|
|
if (ctiocb->iocb_flag & LPFC_IO_LIBDFC) {
|
|
|
/* open up abort window to timeout handler */
|
|
|
- ctiocb->iocb_aux_flag |= LPFC_IO_CMD_OUTSTANDING;
|
|
|
+ ctiocb->iocb_flag |= LPFC_IO_CMD_OUTSTANDING;
|
|
|
}
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
return 0; /* done for now */
|
|
@@ -5338,7 +5338,7 @@ lpfc_bsg_timeout(struct fc_bsg_job *job)
|
|
|
|
|
|
spin_lock_irqsave(&phba->hbalock, flags);
|
|
|
/* make sure the I/O abort window is still open */
|
|
|
- if (!(cmdiocb->iocb_aux_flag & LPFC_IO_CMD_OUTSTANDING)) {
|
|
|
+ if (!(cmdiocb->iocb_flag & LPFC_IO_CMD_OUTSTANDING)) {
|
|
|
spin_unlock_irqrestore(&phba->hbalock, flags);
|
|
|
return -EAGAIN;
|
|
|
}
|