From: Chunyu Hu Date: Tue, 5 Sep 2017 05:36:46 +0000 (+0800) Subject: tracing: Fix clear of RECORDED_TGID flag when disabling trace event X-Git-Tag: v4.13.4~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e614cf2a30dbd4cc1aa53a801fbc03bbb82a8a87;p=users%2Fdwmw2%2Flinux.git tracing: Fix clear of RECORDED_TGID flag when disabling trace event 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 Fixes: d914ba37d7 ("tracing: Add support for recording tgid of tasks") Signed-off-by: Chunyu Hu Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 36132f9280e62..51a6e09a7410b 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -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);