* [PATCH v4] qla2xxx: Return EBUSY on fcport deletion
@ 2020-10-14 7:30 Daniel Wagner
2020-10-22 19:46 ` [EXT] " Arun Easi
2020-10-26 20:13 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Wagner @ 2020-10-14 7:30 UTC (permalink / raw)
To: Nilesh Javali, Arun Easi
Cc: linux-scsi, linux-kernel, Finn Thain, Daniel Wagner
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))
--
2.16.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [EXT] [PATCH v4] qla2xxx: Return EBUSY on fcport deletion
2020-10-14 7:30 [PATCH v4] qla2xxx: Return EBUSY on fcport deletion Daniel Wagner
@ 2020-10-22 19:46 ` Arun Easi
2020-10-26 20:13 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Arun Easi @ 2020-10-22 19:46 UTC (permalink / raw)
To: Daniel Wagner; +Cc: Nilesh Javali, linux-scsi, linux-kernel, Finn Thain
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4] qla2xxx: Return EBUSY on fcport deletion
2020-10-14 7:30 [PATCH v4] qla2xxx: Return EBUSY on fcport deletion Daniel Wagner
2020-10-22 19:46 ` [EXT] " Arun Easi
@ 2020-10-26 20:13 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2020-10-26 20:13 UTC (permalink / raw)
To: Daniel Wagner
Cc: Nilesh Javali, Arun Easi, linux-scsi, linux-kernel, Finn Thain
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!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-26 20:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 7:30 [PATCH v4] qla2xxx: Return EBUSY on fcport deletion Daniel Wagner
2020-10-22 19:46 ` [EXT] " Arun Easi
2020-10-26 20:13 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).