Commit cad1d5bd authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

tracing: Have event_enable_write() just return error on error 

The event_enable_write() function is inconsistent in how it returns
errors. Sometimes it updates the ppos parameter and sometimes it doesn't.
Simplify the code to just return an error or the count if there isn't an
error.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/20241219201345.025284170@goodmis.org


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent d1e27ee9

kernel/trace/trace_events.c

+7 −7
Original line number Diff line number Diff line
@@ -1549,18 +1549,18 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt, 
	switch (val) {

	case 0:

	case 1:

		ret = -ENODEV;

		mutex_lock(&event_mutex);

		file = event_file_file(filp);

		if (likely(file)) {

			ret = tracing_update_buffers(file->tr);

			if (ret < 0) {

				mutex_unlock(&event_mutex);

				return ret;

			}

			if (ret >= 0)

				ret = ftrace_event_enable_disable(file, val);

		} else {

			ret = -ENODEV;

		}

		mutex_unlock(&event_mutex);

		if (ret < 0)

			return ret;

		break;



	default:
@@ -1569,7 +1569,7 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt, 


	*ppos += cnt;



	return ret ? ret : cnt;

	return cnt;

}



static ssize_t