From: David Sterba <dsterba@suse.cz>
To: Bart Van Assche <Bart.VanAssche@wdc.com>
Cc: "dsterba@suse.cz" <dsterba@suse.cz>,
"nborisov@suse.com" <nborisov@suse.com>,
"dsterba@suse.com" <dsterba@suse.com>, "clm@fb.com" <clm@fb.com>,
"jeffm@suse.com" <jeffm@suse.com>,
"jbacik@fb.com" <jbacik@fb.com>,
"linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH] btrfs: Fix a C compliance issue
Date: Wed, 20 Jun 2018 18:55:56 +0200 [thread overview]
Message-ID: <20180620165556.GF24375@twin.jikos.cz> (raw)
In-Reply-To: <c8f558835c1a767e24c00b7c3508a48a4d886cc4.camel@wdc.com>
On Wed, Jun 20, 2018 at 04:44:54PM +0000, Bart Van Assche wrote:
> On Mon, 2018-06-18 at 12:31 +0300, Nikolay Borisov wrote:
> > On 18.06.2018 12:26, David Sterba wrote:
> > > On Sat, Jun 16, 2018 at 01:28:13PM +0300, Nikolay Borisov wrote:
> > > > I'd rather not see more printk being added. Nothing prevents from having
> > > > the fmt string being passed to pr_info.
> > >
> > > So you mean to do
> > >
> > > + static const char fmt[] = "Btrfs loaded, crc32c=%s"
> > > + pr_info(fmt);
> >
> > Pretty much, something along the lines of
> >
> > pr_info(fmt, crc32c_impl).
> >
> > printk requires having the KERN_INFO in the format string, which I see
> > no point in doing, correct me if I'm wrong?
>
> You should know that what you proposed doesn't compile because pr_info()
> relies on string concatenation and hence requires that its first argument is
> a string constant instead of a const char pointer. Anyway, I will rework this
> patch such that it uses pr_info() instead of printk().
Right, the pr_info(fmt,...) does not compile. The closest version I got to is
below. It does not look pretty, but I can't think of a better version right
now.
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2369,7 +2369,8 @@ static __cold void btrfs_interface_exit(void)
static void __init btrfs_print_mod_info(void)
{
- static const char fmt[] = KERN_INFO "Btrfs loaded, crc32c=%s"
+ static const char fmt1[] = "Btrfs loaded, crc32c=";
+ static const char fmt2[] =
#ifdef CONFIG_BTRFS_DEBUG
", debug=on"
#endif
@@ -2383,7 +2384,7 @@ static void __init btrfs_print_mod_info(void)
", ref-verify=on"
#endif
"\n";
- printk(fmt, crc32c_impl());
+ pr_info("%s%s%s", fmt1, crc32c_impl(), fmt2);
}
static int __init init_btrfs_fs(void)
next prev parent reply other threads:[~2018-06-20 16:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-15 22:36 [PATCH] btrfs: Fix a C compliance issue Bart Van Assche
2018-06-16 10:28 ` Nikolay Borisov
2018-06-18 9:26 ` David Sterba
2018-06-18 9:31 ` Nikolay Borisov
2018-06-20 16:44 ` Bart Van Assche
2018-06-20 16:55 ` David Sterba [this message]
2018-06-20 17:19 ` Jeff Mahoney
2018-06-20 17:58 ` Bart Van Assche
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=20180620165556.GF24375@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=Bart.VanAssche@wdc.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jbacik@fb.com \
--cc=jeffm@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/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