From patchwork Mon Oct 12 16:41:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 11833427 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 87438139F for ; Mon, 12 Oct 2020 16:41:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77E422080A for ; Mon, 12 Oct 2020 16:41:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403861AbgJLQl4 (ORCPT ); Mon, 12 Oct 2020 12:41:56 -0400 Received: from mx2.suse.de ([195.135.220.15]:47094 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403785AbgJLQl4 (ORCPT ); Mon, 12 Oct 2020 12:41:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6C064ABAD; Mon, 12 Oct 2020 16:41:54 +0000 (UTC) From: Daniel Wagner To: Nilesh Javali , Arun Easi Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Wagner Subject: [PATCH v2] qla2xxx: Return EBUSY on fcport deletion Date: Mon, 12 Oct 2020 18:41:48 +0200 Message-Id: <20201012164148.42962-1-dwagner@suse.de> X-Mailer: git-send-email 2.16.4 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org 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 --- v2: rebased on mkp/staging drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index 2cd9bd288910..fded1e3bc9e0 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -555,8 +555,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, fcport = qla_rport->fcport; - if (!qpair || !fcport || (qpair && !qpair->fw_started) || + if ((qpair && !qpair->fw_started) || (fcport && fcport->deleted)) + return -EBUSY; + + if (!qpair || !fcport) return -ENODEV; vha = fcport->vha;