From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: stable@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/4] tools/bootconfig: Fix to return 0 if succeeded to show the bootconfig
Date: Tue, 16 Jun 2020 16:53:37 +0900 [thread overview]
Message-ID: <20200616165337.f73e9b787098cc681b21c4b4@kernel.org> (raw)
In-Reply-To: <20200615151442.028c2876@oasis.local.home>
On Mon, 15 Jun 2020 15:14:42 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Sat, 13 Jun 2020 00:23:35 +0900
> Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> > Fix bootconfig to return 0 if succeeded to show the bootconfig
> > in initrd. Without this fix, "bootconfig INITRD" command
> > returns !0 even if the command succeeded to show the bootconfig.
> >
> > Fixes: 950313ebf79c ("tools: bootconfig: Add bootconfig command")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> > ---
> > tools/bootconfig/main.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
> > index 21896a6675fd..ff2cc9520e10 100644
> > --- a/tools/bootconfig/main.c
> > +++ b/tools/bootconfig/main.c
> > @@ -209,8 +209,10 @@ int show_xbc(const char *path)
> > ret = load_xbc_from_initrd(fd, &buf);
> > if (ret < 0)
> > pr_err("Failed to load a boot config from initrd: %d\n", ret);
> > - else
> > + else {
> > xbc_show_compact_tree();
> > + ret = 0;
> > + }
>
> Usually for the above, I think goto is cleaner. As it is strange to
> have a successful case as the "else" condition. Not to mention, if you
> add brackets for one side of the else, it is usually recommended to add
> them for the other side.
>
> But in this case I think it would read better to have:
>
>
> if (ret < 0) {
> pr_err(...);
> goto out;
> }
> xbc_show_compact_tree();
> ret = 0;
> out:
Agreed. OK, I'll update it.
Thank you!
>
> >
> > close(fd);
> > free(buf);
>
> -- Steve
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2020-06-16 7:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 15:23 [PATCH 0/4] bootconfig: Fix quote-character issue and return value Masami Hiramatsu
2020-06-12 15:23 ` [PATCH 1/4] proc/bootconfig: Fix to use correct quotes for value Masami Hiramatsu
2020-06-12 22:42 ` Masami Hiramatsu
2020-06-15 19:11 ` Steven Rostedt
2020-06-15 19:24 ` Joe Perches
2020-06-15 21:21 ` Steven Rostedt
2020-06-15 22:30 ` Randy Dunlap
2020-06-15 22:42 ` Steven Rostedt
2020-06-15 23:12 ` Randy Dunlap
2020-06-16 5:05 ` Joe Perches
2020-06-16 8:05 ` Masami Hiramatsu
2020-06-12 15:23 ` [PATCH 2/4] tools/bootconfig: " Masami Hiramatsu
2020-06-12 15:23 ` [PATCH 3/4] tools/bootconfig: Fix to return 0 if succeeded to show the bootconfig Masami Hiramatsu
2020-06-15 19:14 ` Steven Rostedt
2020-06-16 7:53 ` Masami Hiramatsu [this message]
2020-06-12 15:23 ` [PATCH 4/4] tools/bootconfig: Add testcase for show-command and quotes test Masami Hiramatsu
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=20200616165337.f73e9b787098cc681b21c4b4@kernel.org \
--to=mhiramat@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.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).