From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 4EDF9C433E0 for ; Mon, 1 Jun 2020 18:53:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 203BB20679 for ; Mon, 1 Jun 2020 18:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037618; bh=mHQnSBOaYirfY3WompfFMUBk2fS2LJfxvQu82yPrsZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DJCnufnmbmazvY/6tBLbIYKURu7vZ7AiZdZjYRevWv61uOt+IrXlJ1jqHb5TUuo7U meRWeMhXwi86Yslf8EI5SxVD3UcH/UAuCXGx8hfw3ZOhpYg80BQNchfp4WCYcbCbbr MeQncCihJW+KRTRCCxTRpmHzbfRyJSVQ2iWmAuc0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728631AbgFASxd (ORCPT ); Mon, 1 Jun 2020 14:53:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:46260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730009AbgFASCz (ORCPT ); Mon, 1 Jun 2020 14:02:55 -0400 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 A1587207DF; Mon, 1 Jun 2020 18:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034575; bh=mHQnSBOaYirfY3WompfFMUBk2fS2LJfxvQu82yPrsZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKGg/ZYRBNTmM4hXhEraLYsVavY5H/yvi54RetoxK2aWMCW+6jAnvE05ARkoPLQiV jZhnDy457ExoTiIkFbFsURcmyvK/KpnGPhALtYAfjs8EPPVatBcf3IXnr932jLWvcY 3bKjw9QlcEF6tBydtJuNmJc27nIBBoHsxb0cvuTw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roi Dayan , Mark Bloch , Saeed Mahameed Subject: [PATCH 4.19 15/95] net/mlx5: Annotate mutex destroy for root ns Date: Mon, 1 Jun 2020 19:53:15 +0200 Message-Id: <20200601174023.293343949@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174020.759151073@linuxfoundation.org> References: <20200601174020.759151073@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: X-Mailing-List: stable@vger.kernel.org From: Roi Dayan commit 9ca415399dae133b00273a4283ef31d003a6818d upstream. Invoke mutex_destroy() to catch any errors. Fixes: 2cc43b494a6c ("net/mlx5_core: Managing root flow table") Signed-off-by: Roi Dayan Reviewed-by: Mark Bloch Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -364,6 +364,12 @@ static void del_sw_ns(struct fs_node *no static void del_sw_prio(struct fs_node *node) { + struct mlx5_flow_root_namespace *root_ns; + struct mlx5_flow_namespace *ns; + + fs_get_obj(ns, node); + root_ns = container_of(ns, struct mlx5_flow_root_namespace, ns); + mutex_destroy(&root_ns->chain_lock); kfree(node); }