From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758226AbcBTLhW (ORCPT ); Sat, 20 Feb 2016 06:37:22 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38124 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752803AbcBTLhP (ORCPT ); Sat, 20 Feb 2016 06:37:15 -0500 Date: Sat, 20 Feb 2016 03:36:06 -0800 From: tip-bot for Wang Nan Message-ID: Cc: namhyung@kernel.org, wangnan0@huawei.com, acme@redhat.com, masami.hiramatsu.pt@hitachi.com, hekuang@huawei.com, jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, kirr@nexedi.com, lizefan@huawei.com, peterz@infradead.org, brendan.d.gregg@gmail.com, jeremie.galarneau@efficios.com, dev@codyps.com, tglx@linutronix.de, hpa@zytor.com, ast@kernel.org, adrian.hunter@intel.com Reply-To: lizefan@huawei.com, peterz@infradead.org, kirr@nexedi.com, tglx@linutronix.de, hpa@zytor.com, ast@kernel.org, adrian.hunter@intel.com, brendan.d.gregg@gmail.com, dev@codyps.com, jeremie.galarneau@efficios.com, acme@redhat.com, masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, hekuang@huawei.com, mingo@kernel.org, jolsa@kernel.org In-Reply-To: <1455882283-79592-4-git-send-email-wangnan0@huawei.com> References: <1455882283-79592-4-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bpf: Rename bpf_prog_priv__clear() to clear_prog_priv() Git-Commit-ID: 80cdce7666924158af63ba5071805a28800ebe4b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 80cdce7666924158af63ba5071805a28800ebe4b Gitweb: http://git.kernel.org/tip/80cdce7666924158af63ba5071805a28800ebe4b Author: Wang Nan AuthorDate: Fri, 19 Feb 2016 11:43:51 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 19 Feb 2016 19:12:46 -0300 perf bpf: Rename bpf_prog_priv__clear() to clear_prog_priv() The name of bpf_prog_priv__clear() doesn't follow perf's naming convention. bpf_prog_priv__delete() seems to be a better name. However, bpf_prog_priv__delete() should be a method of 'struct bpf_prog_priv', but its first parameter is 'struct bpf_program'. It is callback from libbpf to clear priv structures when destroying a bpf program. It is actually a method of bpf_program (libbpf object), but bpf_program__ functions should be provided by libbpf. This patch removes the prefix of that function. Signed-off-by: Wang Nan Cc: Adrian Hunter Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Cody P Schafer Cc: He Kuang Cc: Jeremie Galarneau Cc: Jiri Olsa Cc: Kirill Smelkov Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1455882283-79592-4-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/bpf-loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 540a7ef..0bdccf4 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -108,8 +108,8 @@ void bpf__clear(void) } static void -bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused, - void *_priv) +clear_prog_priv(struct bpf_program *prog __maybe_unused, + void *_priv) { struct bpf_prog_priv *priv = _priv; @@ -337,7 +337,7 @@ config_bpf_program(struct bpf_program *prog) } pr_debug("bpf: config '%s' is ok\n", config_str); - err = bpf_program__set_private(prog, priv, bpf_prog_priv__clear); + err = bpf_program__set_private(prog, priv, clear_prog_priv); if (err) { pr_debug("Failed to set priv for program '%s'\n", config_str); goto errout;