From: Steven Rostedt Date: Sat, 30 Apr 2011 02:35:33 +0000 (-0400) Subject: ftrace: Only update the function code on write to filter files X-Git-Tag: v2.6.34.12~181 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a6e54faf593e6a7526e16fe56deb4a29d7d172e;p=karo-tx-linux.git ftrace: Only update the function code on write to filter files commit 058e297d34a404caaa5ed277de15698d8dc43000 upstream. If function tracing is enabled, a read of the filter files will cause the call to stop_machine to update the function trace sites. It should only call stop_machine on write. Signed-off-by: Steven Rostedt Signed-off-by: Paul Gortmaker --- diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index e28af02ac6cb..7dd746cc86ff 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2355,14 +2355,16 @@ ftrace_regex_release(struct inode *inode, struct file *file, int enable) ftrace_match_records(parser->buffer, parser->idx, enable); } - mutex_lock(&ftrace_lock); - if (ftrace_start_up && ftrace_enabled) - ftrace_run_update_code(FTRACE_ENABLE_CALLS); - mutex_unlock(&ftrace_lock); - trace_parser_put(parser); kfree(iter); + if (file->f_mode & FMODE_WRITE) { + mutex_lock(&ftrace_lock); + if (ftrace_start_up && ftrace_enabled) + ftrace_run_update_code(FTRACE_ENABLE_CALLS); + mutex_unlock(&ftrace_lock); + } + mutex_unlock(&ftrace_regex_lock); return 0; }