[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20201012173524.46544-1-dwagner@suse.de>
Date:   Mon, 12 Oct 2020 19:35:24 +0200
From:   Daniel Wagner <dwagner@...e.de>
To:     Nilesh Javali <njavali@...vell.com>, Arun Easi <aeasi@...vell.com>
Cc:     linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
        Daniel Wagner <dwagner@...e.de>
Subject: [PATCH v3] qla2xxx: Return EBUSY on fcport deletion
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 in case we have a valid qpair but the firmware has not yet
started return EBUSY to avoid dropping the request.
Signed-off-by: Daniel Wagner <dwagner@...e.de>
---
v3: simplify 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
Powered by blists - more mailing lists
 
