Skip to content

Commit

Permalink
scsi: lpfc: remove duplicate unloading checks
Browse files Browse the repository at this point in the history
During code reviews several instances of duplicate module unloading checks
were found.

Remove the duplicate checks.

Link: https://lore.kernel.org/r/20200421203354.49420-1-jsmart2021@gmail.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
James Smart authored and Martin K. Petersen committed Apr 22, 2020
1 parent 355f46b commit e304142
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 24 deletions.
10 changes: 2 additions & 8 deletions drivers/scsi/lpfc/lpfc_els.c
Original file line number Diff line number Diff line change
Expand Up @@ -7936,19 +7936,13 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)
if (unlikely(!pring))
return;

if ((phba->pport->load_flag & FC_UNLOADING))
if (phba->pport->load_flag & FC_UNLOADING)
return;

spin_lock_irq(&phba->hbalock);
if (phba->sli_rev == LPFC_SLI_REV4)
spin_lock(&pring->ring_lock);

if ((phba->pport->load_flag & FC_UNLOADING)) {
if (phba->sli_rev == LPFC_SLI_REV4)
spin_unlock(&pring->ring_lock);
spin_unlock_irq(&phba->hbalock);
return;
}

list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
cmd = &piocb->iocb;

Expand Down
5 changes: 0 additions & 5 deletions drivers/scsi/lpfc/lpfc_nvme.c
Original file line number Diff line number Diff line change
Expand Up @@ -1491,11 +1491,6 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,

phba = vport->phba;

if (vport->load_flag & FC_UNLOADING) {
ret = -ENODEV;
goto out_fail;
}

if (unlikely(vport->load_flag & FC_UNLOADING)) {
lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR,
"6124 Fail IO, Driver unload\n");
Expand Down
11 changes: 0 additions & 11 deletions drivers/scsi/lpfc/lpfc_nvmet.c
Original file line number Diff line number Diff line change
Expand Up @@ -841,9 +841,6 @@ lpfc_nvmet_xmt_ls_rsp(struct nvmet_fc_target_port *tgtport,
struct ulp_bde64 bpl;
int rc;

if (phba->pport->load_flag & FC_UNLOADING)
return -ENODEV;

if (phba->pport->load_flag & FC_UNLOADING)
return -ENODEV;

Expand Down Expand Up @@ -938,11 +935,6 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,
goto aerr;
}

if (phba->pport->load_flag & FC_UNLOADING) {
rc = -ENODEV;
goto aerr;
}

#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
if (ctxp->ts_cmd_nvme) {
if (rsp->op == NVMET_FCOP_RSP)
Expand Down Expand Up @@ -1062,9 +1054,6 @@ lpfc_nvmet_xmt_fcp_abort(struct nvmet_fc_target_port *tgtport,
struct lpfc_queue *wq;
unsigned long flags;

if (phba->pport->load_flag & FC_UNLOADING)
return;

if (phba->pport->load_flag & FC_UNLOADING)
return;

Expand Down

0 comments on commit e304142

Please sign in to comment.