From patchwork Fri May 22 14:42:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 6465151 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1A5F9F318 for ; Fri, 22 May 2015 14:42:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0780320160 for ; Fri, 22 May 2015 14:42:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21E7720458 for ; Fri, 22 May 2015 14:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756929AbbEVOmp (ORCPT ); Fri, 22 May 2015 10:42:45 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:36529 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756536AbbEVOmo (ORCPT ); Fri, 22 May 2015 10:42:44 -0400 Received: by qkx62 with SMTP id 62so12605568qkx.3 for ; Fri, 22 May 2015 07:42:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=OufXcRq8Ala94L3bojTXXE3loH20trpi/OZBLzocchQ=; b=FasnEkLR+kavZbi3dlFiooLEhWcyaZexqN9e9MNIMmlHezlJKqc1eqsU5p1e1t9Av6 CeHqlf92b91binHd3nYSUT3ua+xuE9eb0v6mZVcigc+QVSm9QiWCQC7mJtTaDk4pCKRA rMZ+MmxI705F65JClxbwyj5yQqyKUc4IUWmoIw1Ol1Md4SKhBckeWAVFiVgOyA22YhEd XJNjpZd0JRrYdejl3gleSzjZCM7/k4f7G9pJjKUFPHw6eOG1yI/rpJt7gYooJv3GfXqV jovOLITJSsLNUogrJbiAjQDgsfyxso1Vfo5FLiHUKWlvPFn7cLTMiwFOHBdhTRI9f0j5 x2Yw== X-Gm-Message-State: ALoCoQmTapchI2OUTjeNr9M20u0iPlryeeSC3RZ1vQfQqINGmsXytjaV43Ee8uYd5DCt11sEJxL1 X-Received: by 10.55.40.7 with SMTP id o7mr18686288qkh.81.1432305763315; Fri, 22 May 2015 07:42:43 -0700 (PDT) Received: from myfc17 (c-75-67-235-135.hsd1.nh.comcast.net. [75.67.235.135]) by mx.google.com with ESMTPSA id w139sm1413932qha.7.2015.05.22.07.42.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 22 May 2015 07:42:43 -0700 (PDT) Date: Fri, 22 May 2015 10:42:36 -0400 From: james.smart@avagotech.com (James Smart) To: linux-scsi@vger.kernel.org Subject: [PATCH 2/9] lpfc: Fix vport deletion failure. Message-ID: <555f405c.KmVvOAygQVUDcayN%james.smart@avagotech.com> User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix vport deletion failure. If a vport was deleted while in the middle of discovery, we weren't clearing the nport discovery flag. Correct by clearing the flag and cancelling our discovery timeout timer. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Hannes Reinecke --- drivers/scsi/lpfc/lpfc_els.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 3aad09f..30021f3 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -8410,8 +8410,10 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, if (irsp->ulpStatus == IOSTAT_SUCCESS) { spin_lock_irq(shost->host_lock); + vport->fc_flag &= ~FC_NDISC_ACTIVE; vport->fc_flag &= ~FC_FABRIC; spin_unlock_irq(shost->host_lock); + lpfc_can_disctmo(vport); } }