btrfs: Fix a C compliance issue
diff mbox

Message ID 20180620165556.GF24375@twin.jikos.cz
State New
Headers show

Commit Message

David Sterba June 20, 2018, 4:55 p.m. UTC
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.

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

--- 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)