Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4580301pxu; Tue, 13 Oct 2020 01:46:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyX2cAIa1ecsa3oArbxORyInShpGnojA8A2yN1712mp9Cbg/UJGX+0ucetpGnE31Pe/9n09 X-Received: by 2002:a17:906:f29a:: with SMTP id gu26mr30391993ejb.363.1602578807811; Tue, 13 Oct 2020 01:46:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602578807; cv=none; d=google.com; s=arc-20160816; b=0I/VqjOuLBw2Kh/U2eUCObewxWeW25Wb+DjJigT2ZHgBay4ZgwGVWxrXvAMJ5eJUdu qbpsso++fvW5fTiOFMDJ/vTzrhPnjnfwDbIbBAAl1/9hb5ICfwKAA0jZsC0t1B2L06Vs cH43/PKCuKxu2Oaz6TOuDQu81bteMLucHv4u5LvrwTp8NCRJFpWMwG/vIXi/Kw1d1+Eb D0XXxSJXEOnUwwfGzg0ox8IMAtKBKVtp6fn+mhjV88cEMWyZd3ffoN/kqLRPuA3GAemH YaHPUUS34BCJX3NpbAMUQZptGCP9nTVEZKMpCL2H0855DNtsyYb9//iOLFV48PJ1S5wj oIXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=aPVbF2RTzdjws8JfW0ZR0bTPoBUnc4iDnswTQNWjsaw=; b=hn77ilJZZnGuKsgHfsdMLsf2qK4D2X9wN3eZB2atlNnQZU0M4jUflJznAbE5u//6+L Ohm6qtghDdO6upNQdWh+ZALNLy4iGideYbYX7KWzJNFNuFTSJTjBoaSdksz2NF/co0Lp GR+PwbBCdpaZApmjHK3EyK7w61Bgzp+XqI659lGpSciCuxtQfiqYiUa/TePDBxln5wBN sl064MzPIoG16CYrRTzla50MQZJJklKOWjHjz38oIkw/mOl92I6mB/ulPvTMaVtqjVvH dnhsDl7R/dBAa65SN9QyuJjvvsSb5FjQ83rDiwwDGJmpRGheMVy/EjkWCuDPWollFtOt ktOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n4si13369056ejs.15.2020.10.13.01.46.25; Tue, 13 Oct 2020 01:46:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404121AbgJLRfa (ORCPT + 99 others); Mon, 12 Oct 2020 13:35:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:44454 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404115AbgJLRf3 (ORCPT ); Mon, 12 Oct 2020 13:35:29 -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 2E3EDB1B1; Mon, 12 Oct 2020 17:35:28 +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 v3] qla2xxx: Return EBUSY on fcport deletion Date: Mon, 12 Oct 2020 19:35:24 +0200 Message-Id: <20201012173524.46544-1-dwagner@suse.de> X-Mailer: git-send-email 2.16.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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