diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 18:56:25 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 18:56:25 (GMT) |
| commit | 72cc129e8dae988d2a132467cfd0ecd7623c35fb (patch) | |
| tree | e0a3fdfa3e7cb45e75727fe77558e64ec1bc9b4f /kernel/trace/ftrace.c | |
| parent | 411094acb70f171a111710cf32031c749ffdd28c (diff) | |
| parent | ed146b25942b428f8e8056587b7638ce76573c2f (diff) | |
| download | linux-fsl-qoriq-72cc129e8dae988d2a132467cfd0ecd7623c35fb.tar.xz | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ftrace: Fix unmatched locking in ftrace_regex_write()
ring-buffer: Synchronize resizing buffer with reader lock
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 9c451a1..6dc4e5e 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2222,15 +2222,15 @@ ftrace_regex_write(struct file *file, const char __user *ubuf, ret = ftrace_process_regex(parser->buffer, parser->idx, enable); if (ret) - goto out; + goto out_unlock; trace_parser_clear(parser); } ret = read; - +out_unlock: mutex_unlock(&ftrace_regex_lock); -out: + return ret; } |