Unverified Commit 7e89f2c7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7031 Revert "tracing/trigger: Fix to return error if failed to alloc snapshot" 

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

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b2a45f79 dc8baa3c

kernel/trace/trace_events_trigger.c

+2 −4
Original line number Diff line number Diff line
@@ -1140,10 +1140,8 @@ register_snapshot_trigger(char *glob, struct event_trigger_ops *ops, 
			  struct event_trigger_data *data,

			  struct trace_event_file *file)

{

	int ret = tracing_alloc_snapshot_instance(file->tr);



	if (ret < 0)

		return ret;

	if (tracing_alloc_snapshot_instance(file->tr) != 0)

		return 0;



	return register_trigger(glob, ops, data, file);

}