]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
tracing: Fix clear of RECORDED_TGID flag when disabling trace event
authorChunyu Hu <chuhu@redhat.com>
Tue, 5 Sep 2017 05:36:46 +0000 (13:36 +0800)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 28 Sep 2017 14:34:57 +0000 (10:34 -0400)
BugLink: http://bugs.launchpad.net/bugs/1720154
commit 7685ab6c58557c6234f3540260195ecbee7fc4b3 upstream.

When disabling one trace event, the RECORDED_TGID flag in the event
file is not correctly cleared. It's clearing RECORDED_CMD flag when
it should clear RECORDED_TGID flag.

Link: http://lkml.kernel.org/r/1504589806-8425-1-git-send-email-chuhu@redhat.com
Cc: Joel Fernandes <joelaf@google.com>
Fixes: d914ba37d7 ("tracing: Add support for recording tgid of tasks")
Signed-off-by: Chunyu Hu <chuhu@redhat.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
kernel/trace/trace_events.c

index 36132f9280e627ae91fecc7955148178bb076480..51a6e09a7410b47e5a0614778c0974bd09807156 100644 (file)
@@ -406,7 +406,7 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
 
                        if (file->flags & EVENT_FILE_FL_RECORDED_TGID) {
                                tracing_stop_tgid_record();
-                               clear_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags);
+                               clear_bit(EVENT_FILE_FL_RECORDED_TGID_BIT, &file->flags);
                        }
 
                        call->class->reg(call, TRACE_REG_UNREGISTER, file);