Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f3f009 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

tracing/event: Cleanup the useless dentry variable 



Cleanup the useless dentry variable while creating a kernel
event set of files. trace_create_file() warns if it fails to
create the file anyway, and we don't store the dentry anywhere.

v2: Fix a small conflict in kernel/trace/trace_events.c

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
parent 737f453f

kernel/trace/trace_events.c

+11 −12
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ event_subsystem_dir(const char *name, struct dentry *d_events) 
			   "'%s/filter' entry\n", name);

	}



	entry = trace_create_file("enable", 0644, system->entry,

	trace_create_file("enable", 0644, system->entry,

			  (void *)system->name,

			  &ftrace_system_enable_fops);
@@ -912,7 +912,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, 
		 const struct file_operations *filter,

		 const struct file_operations *format)

{

	struct dentry *entry;

	int ret;



	/*
@@ -930,11 +929,11 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, 
	}



	if (call->regfunc)

		entry = trace_create_file("enable", 0644, call->dir, call,

		trace_create_file("enable", 0644, call->dir, call,

				  enable);



	if (call->id && call->profile_enable)

		entry = trace_create_file("id", 0444, call->dir, call,

		trace_create_file("id", 0444, call->dir, call,

		 		  id);



	if (call->define_fields) {
@@ -944,7 +943,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, 
				   " events/%s\n", call->name);

			return ret;

		}

		entry = trace_create_file("filter", 0644, call->dir, call,

		trace_create_file("filter", 0644, call->dir, call,

				  filter);

	}
@@ -952,7 +951,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, 
	if (!call->show_format)

		return 0;



	entry = trace_create_file("format", 0444, call->dir, call,

	trace_create_file("format", 0444, call->dir, call,

			  format);



	return 0;