From nobody Sun Feb 8 21:27:05 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2C831EEF9 for ; Thu, 26 Dec 2024 14:38:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735223916; cv=none; b=PDyDd5SrBfL+UzzgEhw4y7hfZS1fi9exup4kdN2L6GEMGe9QB4/VME00E0ZLd4HBf3kBRe6n+92V+Ga9HYOsM7tqpQ43T9G9W5vgnmeyynH5KSuw5dIb8cej2AU17gCi97PrjIHrAI4V8VLo8O33+Bom4i3A8nI2yr9AahOT9mQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735223916; c=relaxed/simple; bh=nncaMwGGykMpEZg8g+y7nQBS/ynfZScdgUWh5acgf1U=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=om0/uiEVC9Qb56WlpXWk4uHjFg1eq33uUKBftGcWNQkTSlvIuykw0Ik89IFj2kk1q9tyiVqU28EPJGAV11N9pggTqLu7v5SOcr4jbP2ycjysbFboj22Qb79HwEYtEjuXsvrvKFSf41cOiLilWyYL5MaC9w0T+giLCmRi3uhPPDU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EC4AC4CEDF; Thu, 26 Dec 2024 14:38:36 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1tQp1T-0000000G1qI-1IHU; Thu, 26 Dec 2024 09:39:35 -0500 Message-ID: <20241226143935.156854562@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 26 Dec 2024 09:39:17 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Peter Zijlstra Subject: [for-next][PATCH 03/15] tracing: Have event_enable_write() just return error on error References: <20241226143914.397394975@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt 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 Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Peter Zijlstra Link: https://lore.kernel.org/20241219201345.025284170@goodmis.org Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 1545cc8b49d0..f4eff49faef6 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -1549,18 +1549,18 @@ event_enable_write(struct file *filp, const char __= user *ubuf, size_t cnt, switch (val) { case 0: case 1: - ret =3D -ENODEV; mutex_lock(&event_mutex); file =3D event_file_file(filp); if (likely(file)) { ret =3D tracing_update_buffers(file->tr); - if (ret < 0) { - mutex_unlock(&event_mutex); - return ret; - } - ret =3D ftrace_event_enable_disable(file, val); + if (ret >=3D 0) + ret =3D ftrace_event_enable_disable(file, val); + } else { + ret =3D -ENODEV; } mutex_unlock(&event_mutex); + if (ret < 0) + return ret; break; =20 default: @@ -1569,7 +1569,7 @@ event_enable_write(struct file *filp, const char __us= er *ubuf, size_t cnt, =20 *ppos +=3D cnt; =20 - return ret ? ret : cnt; + return cnt; } =20 static ssize_t --=20 2.45.2