lkml.org 
[lkml]   [2011]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/7] ftrace: Change filter/notrace set functions to return exit code
From
Date
On Wed, 2011-12-21 at 19:56 +0100, Jiri Olsa wrote:
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index b79ab33..7eb702f 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -2912,8 +2912,11 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len,
> mutex_lock(&ftrace_regex_lock);
> if (reset)
> ftrace_filter_reset(hash);
> - if (buf)
> - ftrace_match_records(hash, buf, len);
> + if (buf &&
> + !ftrace_match_records(hash, buf, len)) {

I'm fine with this patch, but the above line break is ugly. Put that on
one line, and it still is < 80 characters.

I could just take this patch and fix the above. No need to make a new
patch set for this one fix.

-- Steve

> + ret = -EINVAL;
> + goto out_regex_unlock;
> + }
>
> mutex_lock(&ftrace_lock);
> ret = ftrace_hash_move(ops, enable, orig_hash, hash);
> @@ -2923,6 +2926,7 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len,
>
> mutex_unlock(&ftrace_lock);
>
> + out_regex_unlock:
> mutex_unlock(&ftrace_regex_lock);
>
> free_ftrace_hash(hash);




\
 
 \ /
  Last update: 2011-12-22 01:15    [W:0.312 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site