diff mbox series

[v4] qla2xxx: Return EBUSY on fcport deletion

Message ID 20201014073048.36219-1-dwagner@suse.de (mailing list archive)
State Accepted
Headers show
Series [v4] qla2xxx: Return EBUSY on fcport deletion | expand

Commit Message

Daniel Wagner Oct. 14, 2020, 7:30 a.m. UTC 
When the fcport is about to be deleted we should return EBUSY instead
of ENODEV. Only for EBUSY the request will be requeued in a multipath
setup.

Also when the firmware has not yet started return EBUSY to avoid
dropping the request.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Arun Easi <aeasi@marvell.com>
---

v4: updated commit message as suggested by Finn
v3: simplify and changed test logic as suggested by Arun
v2: rebased on mkp/staging

 drivers/scsi/qla2xxx/qla_nvme.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Arun Easi Oct. 22, 2020, 7:46 p.m. UTC | #1 
On Wed, 14 Oct 2020, 12:30am, Daniel Wagner wrote:

> External Email
> 
> ----------------------------------------------------------------------
> When the fcport is about to be deleted we should return EBUSY instead
> of ENODEV. Only for EBUSY the request will be requeued in a multipath
> setup.
> 
> Also when the firmware has not yet started return EBUSY to avoid
> dropping the request.
> 
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> Reviewed-by: Arun Easi <aeasi@marvell.com>
> ---
> 
> v4: updated commit message as suggested by Finn
> v3: simplify and changed test logic as suggested by Arun
> v2: rebased on mkp/staging
> 
>  drivers/scsi/qla2xxx/qla_nvme.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
> index 2cd9bd288910..1fa457a5736e 100644
> --- a/drivers/scsi/qla2xxx/qla_nvme.c
> +++ b/drivers/scsi/qla2xxx/qla_nvme.c
> @@ -555,10 +555,12 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
>  
>  	fcport = qla_rport->fcport;
>  
> -	if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
> -	    (fcport && fcport->deleted))
> +	if (!qpair || !fcport)
>  		return -ENODEV;
>  
> +	if (!qpair->fw_started || fcport->deleted)
> +		return -EBUSY;
> +
>  	vha = fcport->vha;
>  
>  	if (!(fcport->nvme_flag & NVME_FLAG_REGISTERED))
> 

Looks good to me.

Regards,
-Arun
Martin K. Petersen Oct. 26, 2020, 8:13 p.m. UTC | #2 
Daniel,

> When the fcport is about to be deleted we should return EBUSY instead
> of ENODEV. Only for EBUSY the request will be requeued in a multipath
> setup.
>
> Also when the firmware has not yet started return EBUSY to avoid
> dropping the request.

Applied to 5.10/scsi-fixes, thanks!
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 2cd9bd288910..1fa457a5736e 100644
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -555,10 +555,12 @@  static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
 
 	fcport = qla_rport->fcport;
 
-	if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
-	    (fcport && fcport->deleted))
+	if (!qpair || !fcport)
 		return -ENODEV;
 
+	if (!qpair->fw_started || fcport->deleted)
+		return -EBUSY;
+
 	vha = fcport->vha;
 
 	if (!(fcport->nvme_flag & NVME_FLAG_REGISTERED))