From patchwork Mon Dec 4 22:45:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10091699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 637FB600C5 for ; Mon, 4 Dec 2017 22:45:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5452529387 for ; Mon, 4 Dec 2017 22:45:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48D6F29446; Mon, 4 Dec 2017 22:45:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08ED629387 for ; Mon, 4 Dec 2017 22:45:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431AbdLDWpp (ORCPT ); Mon, 4 Dec 2017 17:45:45 -0500 Received: from mail-bn3nam01on0085.outbound.protection.outlook.com ([104.47.33.85]:27072 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752216AbdLDWpe (ORCPT ); Mon, 4 Dec 2017 17:45:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WjVa4R28J9hxybDSqdZcCet5UAxtVR//dPNJWP6o+CQ=; b=JZwAcLjxe0SPXV7cE6e26XNqA3Izz72heUA9Ml6igoQW6hn3Hn1QViFWWsR7DRYiQK+XuwgC+Zm/LJYmmhgIgjEvHyyqMqvjDvh2L+axfJ/kJLVXjoBnIm/zL0pOM6AVz/Adv+DjLe9gv6seWfoJz8mX4joZw0t50omHaziLpsQ= Received: from SN1PR0701CA0083.namprd07.prod.outlook.com (10.163.126.51) by SN1PR0701MB1950.namprd07.prod.outlook.com (10.163.131.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Mon, 4 Dec 2017 22:45:33 +0000 Received: from BL2FFO11FD008.protection.gbl (2a01:111:f400:7c09::112) by SN1PR0701CA0083.outlook.office365.com (2a01:111:e400:52fd::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.282.5 via Frontend Transport; Mon, 4 Dec 2017 22:45:33 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD008.mail.protection.outlook.com (10.173.161.4) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.239.4 via Frontend Transport; Mon, 4 Dec 2017 22:45:32 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Mon, 4 Dec 2017 14:45:19 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id vB4MjJst003465; Mon, 4 Dec 2017 14:45:19 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id vB4MjJDe003464; Mon, 4 Dec 2017 14:45:19 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH v3 05/22] qla2xxx: Fix re-login for Nport Handle in use Date: Mon, 4 Dec 2017 14:45:00 -0800 Message-ID: <20171204224517.3409-6-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171204224517.3409-1-himanshu.madhani@cavium.com> References: <20171204224517.3409-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(2980300002)(428002)(199003)(189002)(110136005)(54906003)(42186006)(16586007)(316002)(72206003)(87636003)(478600001)(51416003)(86362001)(47776003)(4326008)(76176011)(106466001)(105586002)(50226002)(69596002)(80596001)(36756003)(356003)(189998001)(5660300001)(2906002)(33646002)(8936002)(305945005)(50466002)(6666003)(1076002)(81156014)(8676002)(2950100002)(81166006)(101416001)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0701MB1950; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD008; 1:/gpZxJTbfxuhTQpnT0llLBGgJmGKlEcu1SgAXsnRefiLldjNwMI/HxJSbguvh2VOLxR7T3IiMA+L4NY4AvY6Fgc3D6QzW6K9vOKzolUMNEG7Ie9y2zYgrcAaJpPOS3gk X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80851e7c-65af-400a-82d5-08d53b68ba33 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603286); SRVR:SN1PR0701MB1950; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1950; 3:LK23+by6KAOVNiHzkZ0KF+hJ/Si66jQK7h4z3FpFszqm95oU/ll3T/6+UWTsaAI8YScITJrWm8AKH/Hz4qZyAJDjosTrB4UvJmtGrxc259Y4u4IDu+UBBJn7b146Q3b45meESoV3ZdWF6lTgvu+Q11tMdHgs7q/+8FtOeDO7pb0OTBoNxW/OUwYj13TPExHgrvIeORrC6Qbr5+GOtXswbcVp/D/7v62WEULY7RzkOFuMfYKEG1Vun69c7t81svCGVwlQMSBB3zxzT0p9aTdGmBEkyg6Od3LyP4lPxnk7FlCzHBPJ3p6UGaHDeVgkGyokrsPN6JkTF4xnci99l2xBDd3SDfSBIXbBLCgNEOC6eLQ=; 25:2HDes3d+h2j5OD0b4WR25WAHQzYJrqZXWPhGwq6UZT5xoGm8wndVTma+XlECxtdB681JZayQjV4uDXs3Gv9yz2uQO3qrFI8U3GNCsZdU6f1kBrPwQhBsVC+9fv15No8WhNcIs8YmYeNLGYgUQB0cfTL/yt9gan6S/DlMT3hGo0x8yUdETr63sI5prauu9EdDlbK2E6a5rdFJvcoPS/SjI2V8k2fZFHCF5gpnBcDzPpyjR+6TryBZy4p/3OjEY+nopSV49m62feUgPcXmyiheX0wnixkPXfE76Mtci8CqXLFf4pc1Z3Igq47ozBw/7xrazUjWAYaYekcelA3BO6xNNLruivDiCMW0UFSbyafMROg= X-MS-TrafficTypeDiagnostic: SN1PR0701MB1950: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1950; 31:GsFUwytMP2MVu+IpL2IJT7jtdoCDDKqmd79vzzTYhe5V5k3nJMkaIq+0uATTuUDKXp85Bcu3aABMc0cUfmVnnKeS358oHWYKPlVfLOjN1kWBwwLZPh6O3st7blEZ92sHK0uozFRDi8Hv4hqzaTNd9nf96kyvXFjeVKlEwkUOy8F2c8qZT+a9WGI9wdYxR9PKzjgaD2kz45+SoFueqA+KoFH6ypdYEfO5sxEuRQYizvc=; 20:C+2bZuC4t4fzkFc8kID9gcPxxLvz8fCvupqFfv864FTTcrYBAeXfGBGN6p5O0pKdxSUW84BfJKJpI3yWdwKN4aOUxud/JWlW2mteKkahx60zztmFSf8oJdAPHssTMfMbwxJkdkw8TWu4NZYZ32f7M2E3UhptroAj4MStvsTRuXYSGjw08h0xQ7hkf0UF0S6r+6ZF/qs+8dldnrJQGqfeILLnTcboNENVO+wgegq+VkZaK6knLzb11L3wNsrz8P0fRF9kQ2BoFeeiJA8oeTG65XHn5sMKUiKLLxIWMWc/8R40OTttD/WHQf1c9Ni8rOc730e0VF+r71E3sNKWgTBJKdoIb6QHWfQznVLVt7kMi2dJEGQ3mCD7QMRwYmoOirCB5EQn+gu1vuqZyLpgz0G2grBjdLa8GmXHv8MCXrs6iWbO5pXQ6r9yuTVXS617ROtGNlDZOl25FwQX70h5sLLheJYwMBTwJKJf9Fs5QdpbOiWIEgb06T7/vbmbEmxpPn/p X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123564025)(6072148)(201708071742011); SRVR:SN1PR0701MB1950; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1PR0701MB1950; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1950; 4:9XWeBD0PjiEtMWVpjOTFfbIHiA/yUrNP7IG+lGHUKIS/2GBbyZRkTu0aHYqRcV5zWpB5QC8bm17TSDZ9cd5pnuAyCFyTU2+Ilxc91Wd+xw0g+qBG7r3HPFHFxDAV7GMCSjnO3XY0AMvWw11Y+iqQ4TJXBNDrWjVZlvWnJZPWfS/yvNU5pmurCzDDXewGgD1JmDPou3jjRPywhqEP/+jD5HnUBoksO4ZzqeZa2lO0BmqQlr2+cyJbZVFRq31PsBhZo3xiMdnxGYjU+HmyNc2e4G2Klg9W+LK+UsNGxbcSqnspeOgYktHY4v33S1fGz4pO X-Forefront-PRVS: 051158ECBB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0701MB1950; 23:c+o5OXBOU5hLYZeZVRxBgDBWG6amzesAnQTvazB?= =?us-ascii?Q?1Ef0zcWFFUxoWjYnJON3lGzScCNJ+hlFa14rITp6m1kWeDNsnMljG6YS3J64?= =?us-ascii?Q?O8RwwPlhSl4oQbcglykC+5RGmQD80T7QbnYy7vBryxoxq0OHP66eA9WlfZbO?= =?us-ascii?Q?C9hVpdgUyHX6DFULmxRl2A61fZMiFJeI23qRZy+ssnqU8On5ABdmRe+cudmd?= =?us-ascii?Q?Hozj7JfJ4p1etSyvrA1os/KTb6Kh0MTj9sWPGY8jcTAJDmvxLivYZ4DUD27Q?= =?us-ascii?Q?CtBZFlR4SzV61dfps+x/Hn8YEUEB1+BZ9TfZ3OTkzOI++X7y2kkzIJHjqw8D?= =?us-ascii?Q?Tk1UK4p1wiQf8daePLtCQSTgKRmwENnd1WfGMJZXS+claFZTKEvyA3jlXVoj?= =?us-ascii?Q?WHMCgeM8xZL1OkFcKgULgqrN3ce8pkzbh/JbB8xvFEjy74wFtie7cwb2LB+K?= =?us-ascii?Q?Y6hkC/IQNlp42h2PAEdG9EWPQ96lUwECSPBNv9CmAfs8LPLEiImbXEb7ID+8?= =?us-ascii?Q?Wu8IIUtmlB4y7th+Ttbf533fml/7xmz+pH+Tn9W//88PS/r1a9PRSaClN3pa?= =?us-ascii?Q?l6WnVvVYwnVt9NVqd01MWvLZz9MlDnZTOAqj668uKDpESD4o+uXX4DkwLv4G?= =?us-ascii?Q?Zvs0m2ZAZhGVjrKFPIVlvAcMCG/Wvsfqzb1kY1xvi84r4l9VoSoD8eGvqN3R?= =?us-ascii?Q?YJt5nHGGej8ZtaXwUANg4exOUvUl90Qt5tcTAv/9VfTe1c2469c3X+yhbHuX?= =?us-ascii?Q?O2NwxXuX4VO4jI0XmmKxvoPYP/fY+Zkau13TxnRnuYX5+Idtgs8pWrPResn1?= =?us-ascii?Q?gdfHhd67z3QdXDUov1QaNJ2dYBa8LsVh2lMfJ8sPdspVPog3WtieWcXv2z16?= =?us-ascii?Q?YfxCamH/CNSF3tDa+K44M/3l4E2NmPgHrWF1K3s0bJ/epqdt+HIiWRtiqIJ9?= =?us-ascii?Q?yW2nncUmLV3kTCYkn9KRtcradGbgeJQiimP0F5dWGWeMsiNMD/R2wgF6jznW?= =?us-ascii?Q?tiww=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1950; 6:gy3rH14YKyzN60hxhYvezgOJXxZ0iKELv5zuswn5+wrGCr4Kz2DuVp1Q/PNS0kDLxBDGOB4Lr1RB8dD8M8EgRnHjLIr5UzsUS0n5jZOgjCIt8B6aEi5k4aRGv20I7TkUuPnKMUUxh9gWnLd+BmFpeo3TYN8tI/IQA8HOo1k0jU/CJUrOCZx1vFfT+4+lsiF5a5SGITlklUR8XhUEjYrAOm9C67iWAjorZ1hsb/eIeXco/u2cRQ3NofWM/2Ihs3lKd4viKPQd2Wzm/p0x7g5JP4pno/IfeKn9Vqyxhb7ou9iso1FQgkAzCB2Hi3bwF1OYu05M1T/opW1d10R9Fiipn5RjNqmLWIW+MxuWidF8zNc=; 5:6ioFIIdrEBCx9agel6QlUOz1ZE9ZZRJb8IFOatvij0q0YeDM5zI7dp2CvAN0NyVNMpyNlJc1EHwyaswgKetd8BMSjHuTv/NGYw8iW7TJyVJfeQtlVB+PawoMbkx3m9HQhYyDOj6fJI+ZReRB7QVDpPQgU7/Bv44r2JLt4xQTy0c=; 24:h80HLxKnW1qwHGjW9mJQvOFNZApq8+VPjj3JlOo02u/r5/qQqZoLyNQz/hCWFSTnIPhKm2dlNX7S3LXrA56j/1aWt3OURqIdA4kN94D/Suc=; 7:hs58NUu7ehozFtXWG8r0/pCknVsQhpD1U4tfXDHBOVBNGmoFVpwVyDxnZ2M1kKNAhGj6J6eJF+ti2pm/KMN88Pk8se8L8S6/msdmsi77Ffa4pr7QzZ+Gx1TFEk3UFDuoqIIeNSgNkM/Cb3aFUcMBavV0znSKShruE11j2ErCwRrF0ps6fnjQ8rMXiotzajz6n2Ozzs7X4EIH/T8sZGUudixu7jiXRYzDlYXPoRkZFiNTEO8X/dvSfE7ED3SJ1JO8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2017 22:45:32.5936 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80851e7c-65af-400a-82d5-08d53b68ba33 X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0701MB1950 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Quinn Tran When NPort Handle is in use, driver needs to mark the handle as used and pick another. Instead, the code clears the handle and re-pick the same handle. Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery") Cc: # 4.10+ Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 16 ++++++++++----- drivers/scsi/qla2xxx/qla_init.c | 44 +++++++++++++++++++++++++++++++++++++---- drivers/scsi/qla2xxx/qla_isr.c | 5 ----- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index ddc69d36877e..8984f857bb34 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -2833,7 +2833,7 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea) } } else { /* fcport->d_id.b24 != ea->id.b24 */ fcport->d_id.b24 = ea->id.b24; - if (fcport->deleted == QLA_SESS_DELETED) { + if (fcport->deleted != QLA_SESS_DELETED) { ql_dbg(ql_dbg_disc, vha, 0x2021, "%s %d %8phC post del sess\n", __func__, __LINE__, fcport->port_name); @@ -3206,10 +3206,16 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res) struct event_arg ea; struct qla_work_evt *e; - ql_dbg(ql_dbg_disc, vha, 0x2066, - "Async done-%s res %x ID %3phC. %8phC\n", - sp->name, res, ct_req->req.port_id.port_id, - ct_rsp->rsp.gpn_id.port_name); + if (res) + ql_dbg(ql_dbg_disc, vha, 0x2066, + "Async done-%s fail res %x ID %3phC. %8phC\n", + sp->name, res, ct_req->req.port_id.port_id, + ct_rsp->rsp.gpn_id.port_name); + else + ql_dbg(ql_dbg_disc, vha, 0x2066, + "Async done-%s good ID %3phC. %8phC\n", + sp->name, ct_req->req.port_id.port_id, + ct_rsp->rsp.gpn_id.port_name); if (res) { sp->free(sp); diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 1bafa043f9f1..be4c67b465b8 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1452,6 +1452,8 @@ static void qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) { port_id_t cid; /* conflict Nport id */ + u16 lid; + struct fc_port *conflict_fcport; switch (ea->data[0]) { case MBS_COMMAND_COMPLETE: @@ -1467,8 +1469,12 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) qla24xx_post_prli_work(vha, ea->fcport); } else { ql_dbg(ql_dbg_disc, vha, 0x20ea, - "%s %d %8phC post gpdb\n", - __func__, __LINE__, ea->fcport->port_name); + "%s %d %8phC LoopID 0x%x in use with %06x. post gnl\n", + __func__, __LINE__, ea->fcport->port_name, + ea->fcport->loop_id, ea->fcport->d_id.b24); + + set_bit(ea->fcport->loop_id, vha->hw->loop_id_map); + ea->fcport->loop_id = FC_NO_LOOP_ID; ea->fcport->chip_reset = vha->hw->base_qpair->chip_reset; ea->fcport->logout_on_delete = 1; ea->fcport->send_els_logo = 0; @@ -1513,8 +1519,38 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) ea->fcport->d_id.b.domain, ea->fcport->d_id.b.area, ea->fcport->d_id.b.al_pa); - qla2x00_clear_loop_id(ea->fcport); - qla24xx_post_gidpn_work(vha, ea->fcport); + lid = ea->iop[1] & 0xffff; + qlt_find_sess_invalidate_other(vha, + wwn_to_u64(ea->fcport->port_name), + ea->fcport->d_id, lid, &conflict_fcport); + + if (conflict_fcport) { + /* + * Another fcport share the same loop_id/nport id. + * Conflict fcport needs to finish cleanup before this + * fcport can proceed to login. + */ + conflict_fcport->conflict = ea->fcport; + ea->fcport->login_pause = 1; + + ql_dbg(ql_dbg_disc, vha, 0x20ed, + "%s %d %8phC NPortId %06x inuse with loopid 0x%x. post gidpn\n", + __func__, __LINE__, ea->fcport->port_name, + ea->fcport->d_id.b24, lid); + qla2x00_clear_loop_id(ea->fcport); + qla24xx_post_gidpn_work(vha, ea->fcport); + } else { + ql_dbg(ql_dbg_disc, vha, 0x20ed, + "%s %d %8phC NPortId %06x inuse with loopid 0x%x. sched delete\n", + __func__, __LINE__, ea->fcport->port_name, + ea->fcport->d_id.b24, lid); + + qla2x00_clear_loop_id(ea->fcport); + set_bit(lid, vha->hw->loop_id_map); + ea->fcport->loop_id = lid; + ea->fcport->keep_nport_handle = 0; + qlt_schedule_sess_for_deletion(ea->fcport, false); + } break; } return; diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 2fd79129bb2a..545c527263d0 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -2369,7 +2369,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) int res = 0; uint16_t state_flags = 0; uint16_t retry_delay = 0; - uint8_t no_logout = 0; sts = (sts_entry_t *) pkt; sts24 = (struct sts_entry_24xx *) pkt; @@ -2640,7 +2639,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) break; case CS_PORT_LOGGED_OUT: - no_logout = 1; case CS_PORT_CONFIG_CHG: case CS_PORT_BUSY: case CS_INCOMPLETE: @@ -2671,9 +2669,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) port_state_str[atomic_read(&fcport->state)], comp_status); - if (no_logout) - fcport->logout_on_delete = 0; - qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1); qlt_schedule_sess_for_deletion_lock(fcport); }