Commit edf57cbf authored Jun 20, 2018 by Bart Van Assche Committed by David Sterba Aug 06, 2018

btrfs: Fix a C compliance issue



The C programming language does not allow to use preprocessor statements
inside macro arguments (pr_info() is defined as a macro). Hence rework
the pr_info() statement in btrfs_print_mod_info() such that it becomes
compliant. This patch allows tools like sparse to analyze the BTRFS
source code.

Fixes: 62e85577 ("btrfs: convert printk(KERN_* to use pr_* calls")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent acd43e3c

fs/btrfs/super.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2370,7 +2370,7 @@ static __cold void btrfs_interface_exit(void)

		static void __init btrfs_print_mod_info(void)
		{
		pr_info("Btrfs loaded, crc32c=%s"
		static const char options[] = ""
		#ifdef CONFIG_BTRFS_DEBUG
		", debug=on"
		#endif
		@@ -2383,8 +2383,8 @@ static void __init btrfs_print_mod_info(void)
		#ifdef CONFIG_BTRFS_FS_REF_VERIFY
		", ref-verify=on"
		#endif
		"\n",
		crc32c_impl());
		;
		pr_info("Btrfs loaded, crc32c=%s%s\n", crc32c_impl(), options);
		}

		static int __init init_btrfs_fs(void)

Admin message