diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-09-21 12:17:37 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-09-26 13:37:06 -0400 |
| commit | c01f5f96f511419ee656a60e09605b7b6a63b66c (patch) | |
| tree | c7620ef5a210b8304e46a514d42b84036fad44b2 /fs | |
| parent | 04ab956ee69cdbe8627f6e34b88af5c308eede84 (diff) | |
btrfs: btrfs_debug should consume fs_info when DEBUG is not defined
We can hit unused variable warnings when btrfs_debug and friends are
just aliases for no_printk. This is due to the fs_info not getting
consumed by the function call, which can happen if convenenience
variables are used. This patch adds a new btrfs_no_printk static inline
that consumes the convenience variable and does nothing else. It
silences the unused variable warning and has no impact on the generated
code:
$ size fs/btrfs/extent_io.o*
text data bss dec hex filename
44072 152 32 44256 ace0 fs/btrfs/extent_io.o.btrfs_no_printk
44072 152 32 44256 ace0 fs/btrfs/extent_io.o.no_printk
Fixes: 27a0dd61a5 (Btrfs: make btrfs_debug match pr_debug handling related to DEBUG)
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 9e8fd5ecef55..cb0ae90649c0 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -3244,6 +3244,12 @@ int btrfs_sync_fs(struct super_block *sb, int wait); | |||
| 3244 | #ifdef CONFIG_PRINTK | 3244 | #ifdef CONFIG_PRINTK |
| 3245 | __printf(2, 3) | 3245 | __printf(2, 3) |
| 3246 | void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...); | 3246 | void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...); |
| 3247 | __printf(2, 3) | ||
| 3248 | static inline int btrfs_no_printk(const struct btrfs_fs_info *fs_info, | ||
| 3249 | const char *fmt, ...) | ||
| 3250 | { | ||
| 3251 | return 0; | ||
| 3252 | } | ||
| 3247 | #else | 3253 | #else |
| 3248 | static inline __printf(2, 3) | 3254 | static inline __printf(2, 3) |
| 3249 | void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) | 3255 | void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) |
| @@ -3358,13 +3364,13 @@ do { \ | |||
| 3358 | btrfs_printk_ratelimited(fs_info, KERN_DEBUG fmt, ##args) | 3364 | btrfs_printk_ratelimited(fs_info, KERN_DEBUG fmt, ##args) |
| 3359 | #else | 3365 | #else |
| 3360 | #define btrfs_debug(fs_info, fmt, args...) \ | 3366 | #define btrfs_debug(fs_info, fmt, args...) \ |
| 3361 | no_printk(KERN_DEBUG fmt, ##args) | 3367 | btrfs_no_printk(fs_info, KERN_DEBUG fmt, ##args) |
| 3362 | #define btrfs_debug_in_rcu(fs_info, fmt, args...) \ | 3368 | #define btrfs_debug_in_rcu(fs_info, fmt, args...) \ |
| 3363 | no_printk(KERN_DEBUG fmt, ##args) | 3369 | btrfs_no_printk(fs_info, KERN_DEBUG fmt, ##args) |
| 3364 | #define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \ | 3370 | #define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \ |
| 3365 | no_printk(KERN_DEBUG fmt, ##args) | 3371 | btrfs_no_printk(fs_info, KERN_DEBUG fmt, ##args) |
| 3366 | #define btrfs_debug_rl(fs_info, fmt, args...) \ | 3372 | #define btrfs_debug_rl(fs_info, fmt, args...) \ |
| 3367 | no_printk(KERN_DEBUG fmt, ##args) | 3373 | btrfs_no_printk(fs_info, KERN_DEBUG fmt, ##args) |
| 3368 | #endif | 3374 | #endif |
| 3369 | 3375 | ||
| 3370 | #define btrfs_printk_in_rcu(fs_info, fmt, args...) \ | 3376 | #define btrfs_printk_in_rcu(fs_info, fmt, args...) \ |