Unverified Commit 45af58d2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!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: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a55bca01 a25cd8b6

kernel/trace/trace_events.c

+4 −10
Original line number Diff line number Diff line
@@ -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_array *tr = file->tr;

	unsigned long file_flags = file->flags;

	int ret = 0;

	int disable;
@@ -392,6 +391,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, 
				break;

			disable = file->flags & EVENT_FILE_FL_SOFT_DISABLED;

			clear_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags);

			/* Disable use of trace_buffered_event */

			trace_buffered_event_disable();

		} else

			disable = !(file->flags & EVENT_FILE_FL_SOFT_MODE);
@@ -430,6 +431,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, 
			if (atomic_inc_return(&file->sm_ref) > 1)

				break;

			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)) {
@@ -469,15 +472,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, 
		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;

}