From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934051AbbI2Qqt (ORCPT ); Tue, 29 Sep 2015 12:46:49 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:37196 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934828AbbI2Qqk (ORCPT ); Tue, 29 Sep 2015 12:46:40 -0400 From: Dmitry Safonov <0x7f454c46@gmail.com> To: rostedt@goodmis.org Cc: mingo@redhat.com, corbet@lwn.net, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Safonov <0x7f454c46@gmail.com> Subject: [PATCH 1/5] ftrace: remove redundant strsep in mod_callback Date: Tue, 29 Sep 2015 19:46:12 +0300 Message-Id: <1443545176-3215-1-git-send-email-0x7f454c46@gmail.com> X-Mailer: git-send-email 2.5.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org By now there isn't any subcommand for mod. Before: sh$ echo '*:mod:ipv6:a' > set_ftrace_filter sh$ echo '*:mod:ipv6' > set_ftrace_filter had the same results, but now first will result in: sh$ echo '*:mod:ipv6:a' > set_ftrace_filter -bash: echo: write error: Invalid argument Also, I clarified ftrace_mod_callback code a little. Signed-off-by: Dmitry Safonov <0x7f454c46@gmail.com> --- kernel/trace/ftrace.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index b0623ac..f87401b 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3564,8 +3564,7 @@ static int ftrace_mod_callback(struct ftrace_hash *hash, char *func, char *cmd, char *param, int enable) { - char *mod; - int ret = -EINVAL; + int ret; /* * cmd == 'mod' because we only registered this func @@ -3576,16 +3575,12 @@ ftrace_mod_callback(struct ftrace_hash *hash, */ /* we must have a module name */ - if (!param) - return ret; - - mod = strsep(¶m, ":"); - if (!strlen(mod)) - return ret; + if (!param || !strlen(param)) + return -EINVAL; - ret = ftrace_match_module_records(hash, func, mod); - if (!ret) - ret = -EINVAL; + ret = ftrace_match_module_records(hash, func, param); + if (ret == 0) + return -EINVAL; if (ret < 0) return ret; -- 2.5.3