]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ftrace: Only update the function code on write to filter files
authorSteven Rostedt <srostedt@redhat.com>
Sat, 30 Apr 2011 02:35:33 +0000 (22:35 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Jun 2011 01:33:35 +0000 (10:33 +0900)
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 <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/trace/ftrace.c

index 888b611897d3737fddb0c890084cacfbe2a359b3..9803b68dbc3101b080d56075758bfc6e380343db 100644 (file)
@@ -2414,14 +2414,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;
 }