Message ID | 20200102220419.274198366@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=x1Uk=2X=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B06C3C3276C for <stable@archiver.kernel.org>; Thu, 2 Jan 2020 22:23:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8623A20866 for <stable@archiver.kernel.org>; Thu, 2 Jan 2020 22:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003836; bh=8eX3qpVzlLQjVKaV2OXLycyPcB5Xn/YD58X8Azb3kpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=L8cxjNCV0Hav2DidvdHA+u9CgA1YcvAInJaHZ70tcfPNxzLf5Etia2P8DzAZYEQ3H J6BGLtUWgXHv+pG2hkaAbcP7EIIPCxdTJctPBWeei5MvI/WiFoBxk56vHvsN+fDeiS IQV1qsU7+kDseWv+kPuLY+NlrA6IHpBo4+WoMXGY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729128AbgABWXz (ORCPT <rfc822;stable@archiver.kernel.org>); Thu, 2 Jan 2020 17:23:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:47054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729334AbgABWXy (ORCPT <rfc822;stable@vger.kernel.org>); Thu, 2 Jan 2020 17:23:54 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9AC2B222C3; Thu, 2 Jan 2020 22:23:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003834; bh=8eX3qpVzlLQjVKaV2OXLycyPcB5Xn/YD58X8Azb3kpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2f/SdEdXgFpNRg1sHrrH1o2oaGX5GpUvSn/lrwh3G4IEEWrxEqm5axgB/kayMiQIr 1i9PyUBdnDx+DDiMXNeeTydA8fWTYvj9elRP+qGsswwRMOTDLE7RZU9nVY6LMjEvpl 3DTJcxWPOsKA/K8ynRQy7TVnUCr/2a3zh+GSzhBs= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Dick Kennedy <dick.kennedy@broadcom.com>, James Smart <jsmart2021@gmail.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.14 19/91] scsi: lpfc: Fix duplicate unreg_rpi error in port offline flow Date: Thu, 2 Jan 2020 23:07:01 +0100 Message-Id: <20200102220419.274198366@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220356.856162165@linuxfoundation.org> References: <20200102220356.856162165@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 7920b8c72caf..d8e0ba68879c 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -17492,6 +17492,13 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba) static void __lpfc_sli4_free_rpi(struct lpfc_hba *phba, int rpi) { + /* + * if the rpi value indicates a prior unreg has already + * been done, skip the unreg. + */ + if (rpi == LPFC_RPI_ALLOC_ERROR) + return; + if (test_and_clear_bit(rpi, phba->sli4_hba.rpi_bmask)) { phba->sli4_hba.rpi_count--; phba->sli4_hba.max_cfg_param.rpi_used--;