> On Dec 1, 2020, at 2:27 AM, Nilesh Javali <njavali@xxxxxxxxxxx> wrote: > > From: Saurav Kashyap <skashyap@xxxxxxxxxxx> > > NVMe commands can come only after successful addition of rport and nvme > connect, and rport is only registered after FW started bit is set. Remove the > redundant check. > > Signed-off-by: Saurav Kashyap <skashyap@xxxxxxxxxxx> > Signed-off-by: Nilesh Javali <njavali@xxxxxxxxxxx> > --- > drivers/scsi/qla2xxx/qla_nvme.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c > index b7a1dc24db38..d4159d5a4ffd 100644 > --- a/drivers/scsi/qla2xxx/qla_nvme.c > +++ b/drivers/scsi/qla2xxx/qla_nvme.c > @@ -554,19 +554,15 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, > > fcport = qla_rport->fcport; > > - if (!qpair || !fcport) > - return -ENODEV; > - > - if (!qpair->fw_started || fcport->deleted) > + if (unlikely(!qpair || !fcport || fcport->deleted)) > return -EBUSY; > > - vha = fcport->vha; > - > if (!(fcport->nvme_flag & NVME_FLAG_REGISTERED)) > return -ENODEV; > > - if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) || > - (qpair && !qpair->fw_started) || fcport->deleted) > + vha = fcport->vha; > + > + if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags)) > return -EBUSY; > > /* > -- > 2.19.0.rc0 > Looks Good Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx> -- Himanshu Madhani Oracle Linux Engineering
