From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Luis Henriques <luis.henriques@canonical.com>
Subject: [for-next][PATCH 2/7] tracing: Fix tracing_stat return values in error handling paths
Date: Sun, 26 Jan 2020 14:19:34 -0500 [thread overview]
Message-ID: <20200126192020.648050067@goodmis.org> (raw)
In-Reply-To: 20200126191932.984391723@goodmis.org
From: Luis Henriques <luis.henriques@canonical.com>
tracing_stat_init() was always returning '0', even on the error paths. It
now returns -ENODEV if tracing_init_dentry() fails or -ENOMEM if it fails
to created the 'trace_stat' debugfs directory.
Link: http://lkml.kernel.org/r/1410299381-20108-1-git-send-email-luis.henriques@canonical.com
Fixes: ed6f1c996bfe4 ("tracing: Check return value of tracing_init_dentry()")
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
[ Pulled from the archeological digging of my INBOX ]
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_stat.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index da8a38c3d5e4..d1fa19773cc8 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -280,18 +280,22 @@ static int tracing_stat_init(void)
d_tracing = tracing_init_dentry();
if (IS_ERR(d_tracing))
- return 0;
+ return -ENODEV;
stat_dir = tracefs_create_dir("trace_stat", d_tracing);
- if (!stat_dir)
+ if (!stat_dir) {
pr_warn("Could not create tracefs 'trace_stat' entry\n");
+ return -ENOMEM;
+ }
return 0;
}
static int init_stat_file(struct stat_session *session)
{
- if (!stat_dir && tracing_stat_init())
- return -ENODEV;
+ int ret;
+
+ if (!stat_dir && (ret = tracing_stat_init()))
+ return ret;
session->file = tracefs_create_file(session->ts->name, 0644,
stat_dir,
--
2.24.1
next prev parent reply other threads:[~2020-01-26 19:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-26 19:19 [for-next][PATCH 0/7] tracing: Some very old (and some new) patches for 5.6 Steven Rostedt
2020-01-26 19:19 ` [for-next][PATCH 1/7] tracing: Fix very unlikely race of registering two stat tracers Steven Rostedt
2020-01-26 19:19 ` Steven Rostedt [this message]
2020-01-26 19:19 ` [for-next][PATCH 3/7] tracing: Set kernel_stacks caller size properly Steven Rostedt
2020-01-26 19:19 ` [for-next][PATCH 4/7] tracing: Remove unneeded NULL check Steven Rostedt
2020-01-26 19:19 ` [for-next][PATCH 5/7] tracing: Fix comments about trace/ftrace.h Steven Rostedt
2020-01-26 19:19 ` [for-next][PATCH 6/7] tracing: Decrement trace_array when bootconfig creates an instance Steven Rostedt
2020-01-26 19:19 ` [for-next][PATCH 7/7] tracing: Use pr_err() instead of WARN() for memory failures Steven Rostedt
2020-01-26 20:38 ` Joe Perches
2020-01-26 20:50 ` Steven Rostedt
2020-01-26 21:07 ` Joe Perches
2020-01-26 21:40 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200126192020.648050067@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.henriques@canonical.com \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).