lkml.org 
[lkml]   [2017]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[for-next][PATCH 18/33] ftrace: Remove unused unregister_ftrace_function_probe_all() function
    From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

    There are no users of unregister_ftrace_function_probe_all(). The only probe
    function that is used is unregister_ftrace_function_probe_func(). Rename the
    internal static function __unregister_ftrace_function_probe() to
    unregister_ftrace_function_probe_func() and make it global.

    Also remove the PROBE_TEST_FUNC as it would be always set.

    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    ---
    kernel/trace/ftrace.c | 22 +++-------------------
    kernel/trace/trace.h | 1 -
    2 files changed, 3 insertions(+), 20 deletions(-)

    diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    index 5448089e6028..1c31c74d0819 100644
    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -4059,13 +4059,8 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
    return count;
    }

    -enum {
    - PROBE_TEST_FUNC = 1,
    -};
    -
    -static void
    -__unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
    - int flags)
    +void
    +unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops)
    {
    struct ftrace_ops_hash old_hash_ops;
    struct ftrace_func_entry *rec_entry;
    @@ -4115,7 +4110,7 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
    hlist_for_each_entry_safe(entry, tmp, hhd, node) {

    /* break up if statements for readability */
    - if ((flags & PROBE_TEST_FUNC) && entry->ops != ops)
    + if (entry->ops != ops)
    continue;

    /* do this last, since it is the most expensive */
    @@ -4162,17 +4157,6 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
    free_ftrace_hash(hash);
    }

    -void
    -unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops)
    -{
    - __unregister_ftrace_function_probe(glob, ops, PROBE_TEST_FUNC);
    -}
    -
    -void unregister_ftrace_function_probe_all(char *glob)
    -{
    - __unregister_ftrace_function_probe(glob, NULL, 0);
    -}
    -
    static LIST_HEAD(ftrace_commands);
    static DEFINE_MUTEX(ftrace_cmd_mutex);

    diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
    index 507a62e9192e..376d5a798489 100644
    --- a/kernel/trace/trace.h
    +++ b/kernel/trace/trace.h
    @@ -965,7 +965,6 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
    void *data);
    extern void
    unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops);
    -extern void unregister_ftrace_function_probe_all(char *glob);

    int register_ftrace_command(struct ftrace_func_command *cmd);
    int unregister_ftrace_command(struct ftrace_func_command *cmd);
    --
    2.10.2

    \
     
     \ /
      Last update: 2017-04-21 23:40    [W:4.132 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site