openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: fix btrfs_no_printk stub helper 

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>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Arnd Bergmann 2016-09-23 18:05:21 +02:00 committed by David Sterba
parent 851cd173f0
commit 2fd57fcb16
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/btrfs/ctree.h
View File

@ -3256,20 +3256,17 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
unsigned long new_flags); unsigned long new_flags);
int btrfs_sync_fs(struct super_block *sb, int wait); 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 #ifdef CONFIG_PRINTK
__printf(2, 3) __printf(2, 3)
void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...); 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 #else
static inline __printf(2, 3) #define btrfs_printk(fs_info, fmt, args...) \
void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) btrfs_no_printk(fs_info, fmt, ##args)
{
}
#endif #endif
#define btrfs_emerg(fs_info, fmt, args...) \ #define btrfs_emerg(fs_info, fmt, args...) \