* [PATCH] btrfs: fix btrfs_no_printk stub helper
@ 2016-09-23 16:05 Arnd Bergmann
2016-09-26 17:11 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2016-09-23 16:05 UTC (permalink / raw)
To: Chris Mason, Josef Bacik, David Sterba
Cc: Arnd Bergmann, Jeff Mahoney, Qu Wenruo, Filipe Manana,
Omar Sandoval, Anand Jain, linux-btrfs, linux-kernel
The addition of btrfs_no_printk() caused a build failure when
CONFIG_PRINTK is disabled:
fs/btrfs/send.c: In function 'send_rename':
fs/btrfs/ctree.h:3367:2: error: implicit declaration of function 'btrfs_no_printk' [-Werror=implicit-function-declaration]
This moves the helper outside of that #ifdef so it is always
defined, and changes the existing #ifdef to refer to that
helper as well for consistency.
Fixes: 47c57058ff2c ("btrfs: btrfs_debug should consume fs_info when DEBUG is not defined")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
fs/btrfs/ctree.h | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index e5621268c9fe..63bf4cc34626 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3241,20 +3241,17 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
unsigned long new_flags);
int btrfs_sync_fs(struct super_block *sb, int wait);
+static inline __printf(2, 3)
+void btrfs_no_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
+{
+}
+
#ifdef CONFIG_PRINTK
__printf(2, 3)
void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);
-__printf(2, 3)
-static inline int btrfs_no_printk(const struct btrfs_fs_info *fs_info,
- const char *fmt, ...)
-{
- return 0;
-}
#else
-static inline __printf(2, 3)
-void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
-{
-}
+#define btrfs_printk(fs_info, fmt, args...) \
+ btrfs_no_printk(fs_info, fmt, ##args)
#endif
#define btrfs_emerg(fs_info, fmt, args...) \
--
2.9.0
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] btrfs: fix btrfs_no_printk stub helper
2016-09-23 16:05 [PATCH] btrfs: fix btrfs_no_printk stub helper Arnd Bergmann
@ 2016-09-26 17:11 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2016-09-26 17:11 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Chris Mason, Josef Bacik, David Sterba, Jeff Mahoney, Qu Wenruo,
Filipe Manana, Omar Sandoval, Anand Jain, linux-btrfs,
linux-kernel
On Fri, Sep 23, 2016 at 06:05:21PM +0200, Arnd Bergmann wrote:
> The addition of btrfs_no_printk() caused a build failure when
> CONFIG_PRINTK is disabled:
>
> fs/btrfs/send.c: In function 'send_rename':
> fs/btrfs/ctree.h:3367:2: error: implicit declaration of function 'btrfs_no_printk' [-Werror=implicit-function-declaration]
>
> This moves the helper outside of that #ifdef so it is always
> defined, and changes the existing #ifdef to refer to that
> helper as well for consistency.
>
> Fixes: 47c57058ff2c ("btrfs: btrfs_debug should consume fs_info when DEBUG is not defined")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: David Sterba <dsterba@suse.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-26 17:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-23 16:05 [PATCH] btrfs: fix btrfs_no_printk stub helper Arnd Bergmann
2016-09-26 17:11 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®