未验证 提交 45af58d2 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!1580 tracing: Fix warning in trace_buffered_event_disable()

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XXAG5MRMLFEHC4YUSC53DLXBTHM4DVET/ 
 
https://gitee.com/openeuler/kernel/issues/I7P78X 
 
Link:https://gitee.com/openeuler/kernel/pulls/1580 

Reviewed-by: Xu Kuohai <xukuohai@huawei.com> 
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com> 
...@@ -368,7 +368,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, ...@@ -368,7 +368,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
{ {
struct trace_event_call *call = file->event_call; struct trace_event_call *call = file->event_call;
struct trace_array *tr = file->tr; struct trace_array *tr = file->tr;
unsigned long file_flags = file->flags;
int ret = 0; int ret = 0;
int disable; int disable;
...@@ -392,6 +391,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, ...@@ -392,6 +391,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
break; break;
disable = file->flags & EVENT_FILE_FL_SOFT_DISABLED; disable = file->flags & EVENT_FILE_FL_SOFT_DISABLED;
clear_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags); clear_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags);
/* Disable use of trace_buffered_event */
trace_buffered_event_disable();
} else } else
disable = !(file->flags & EVENT_FILE_FL_SOFT_MODE); disable = !(file->flags & EVENT_FILE_FL_SOFT_MODE);
...@@ -430,6 +431,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, ...@@ -430,6 +431,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
if (atomic_inc_return(&file->sm_ref) > 1) if (atomic_inc_return(&file->sm_ref) > 1)
break; break;
set_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags); set_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags);
/* Enable use of trace_buffered_event */
trace_buffered_event_enable();
} }
if (!(file->flags & EVENT_FILE_FL_ENABLED)) { if (!(file->flags & EVENT_FILE_FL_ENABLED)) {
...@@ -469,15 +472,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, ...@@ -469,15 +472,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
break; break;
} }
/* Enable or disable use of trace_buffered_event */
if ((file_flags & EVENT_FILE_FL_SOFT_DISABLED) !=
(file->flags & EVENT_FILE_FL_SOFT_DISABLED)) {
if (file->flags & EVENT_FILE_FL_SOFT_DISABLED)
trace_buffered_event_enable();
else
trace_buffered_event_disable();
}
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册