Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp692857ybg; Mon, 1 Jun 2020 11:50:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1+2bnQiLkS3hnGUAgq3X0OKVqZTBabhBR1C+0Y8qKy9vd2gbwho3JX/WpU9EcWXH/pZi9 X-Received: by 2002:a50:ee18:: with SMTP id g24mr16254954eds.370.1591037440552; Mon, 01 Jun 2020 11:50:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591037440; cv=none; d=google.com; s=arc-20160816; b=hqaLXaiumWJvTdZIQSW+CShXB3mcobaArLtfNJhMTgSj+1QYQNU+2kOtdql/+zkQXC 4nRxN6kafSsfll1eloRJWC8ol4bXCrigip38fpZkKnToaeGgCV0bLguDoBSa339iPZ1E Pu7XcUnUtsvP43BYwhiZvMNN+UAdg3wrk17eYjKvhcGc+McoRkQzSuWdqtkYPgXBszPU qvEmEARgZC/O0uz9mPxeGiXZ3CW9lCDuioSwOklAxsjNx64WlNadfLs26+Ewf6rs33ME f4YLu7aN+ncE81xzU9edxlCpMaqy0ymZ6WwlR2Brayyi2PTOVWtEmyBrq4vpSRw2zpd1 qoVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7o8ZUIasZ6AKYT23T3Z6hfA0Cxi3DWRrwS4VeYWEx+A=; b=krrrjl3xm9mGpR7HXOHHNegxcl15TODaHfLnB/Qq41HcpzpnGS+9UKbKhpOvFm7ZLg 2CGm+xMN6MMXvanUyiBruAD02yx/PNU2fkFM1IYiKE808JPe6mrvB1/7AJn7rLF6rClJ x1DCARqKVGZmBtGV/JI9oeVxkLXFQfJvUJfY/rpuYTOm9D0HlVOlgHAKt2AlMvWtyqn6 ELkyy4dmTWW3zEkMMvZtXNdA6M4G8E9dAijfK+unr0BNi1dBX/oGl4ztSdd66Wyr52f5 1CsZwLoTI//rRIHKRcGhDzrWukMO38gBOZqoTGpDr8npAlbxUBbYHyVMhugJJNCvWvmx FLKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OiNfJJ31; 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 jz13si180571ejb.278.2020.06.01.11.50.16; Mon, 01 Jun 2020 11:50:40 -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; dkim=pass header.i=@kernel.org header.s=default header.b=OiNfJJ31; 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 S1730595AbgFASHc (ORCPT + 99 others); Mon, 1 Jun 2020 14:07:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:52692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730510AbgFASG4 (ORCPT ); Mon, 1 Jun 2020 14:06:56 -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 69135206E2; Mon, 1 Jun 2020 18:06:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034815; bh=MMdtZY4dDGS+q5r4/lE6k9tI4CTwHjBv5J5brzUIVxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OiNfJJ31B8n2MeYgMEAhUHr6lokA+pxTKmUxnSb7K0b8dUvZ93YhWVJxXM8UTQXIS szvK7YfwHxdEDi6Fctstx4ZCE490dzfvv/oTzyuvxZDST3fMhRPpM3R4fUq2ZqwFJV yBfX1ONdql8QkLHSnuuK52f2Z6X6eItd0C5va4yo= 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 5.4 026/142] net/mlx5: Annotate mutex destroy for root ns Date: Mon, 1 Jun 2020 19:53:04 +0200 Message-Id: <20200601174040.562903164@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -417,6 +417,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); }