Merge tag 'for-5.1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
[muen/linux.git] / fs / btrfs / ctree.h
index 0f4838e00fbc892beb64abd118934c033a5e94be..b3642367a595dab3eb50454bd25a5fd168ac9303 100644 (file)
@@ -3451,31 +3451,17 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);
 
 #if defined(CONFIG_DYNAMIC_DEBUG)
 #define btrfs_debug(fs_info, fmt, args...)                             \
-do {                                                                   \
-        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                \
-        if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))         \
-               btrfs_printk(fs_info, KERN_DEBUG fmt, ##args);          \
-} while (0)
-#define btrfs_debug_in_rcu(fs_info, fmt, args...)                      \
-do {                                                                   \
-        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                \
-        if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))                 \
-               btrfs_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args);   \
-} while (0)
+       _dynamic_func_call_no_desc(fmt, btrfs_printk,                   \
+                                  fs_info, KERN_DEBUG fmt, ##args)
+#define btrfs_debug_in_rcu(fs_info, fmt, args...)                      \
+       _dynamic_func_call_no_desc(fmt, btrfs_printk_in_rcu,            \
+                                  fs_info, KERN_DEBUG fmt, ##args)
 #define btrfs_debug_rl_in_rcu(fs_info, fmt, args...)                   \
-do {                                                                   \
-        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                \
-        if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))         \
-               btrfs_printk_rl_in_rcu(fs_info, KERN_DEBUG fmt,         \
-                                      ##args);\
-} while (0)
-#define btrfs_debug_rl(fs_info, fmt, args...)                          \
-do {                                                                   \
-        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                \
-        if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))         \
-               btrfs_printk_ratelimited(fs_info, KERN_DEBUG fmt,       \
-                                        ##args);                       \
-} while (0)
+       _dynamic_func_call_no_desc(fmt, btrfs_printk_rl_in_rcu,         \
+                                  fs_info, KERN_DEBUG fmt, ##args)
+#define btrfs_debug_rl(fs_info, fmt, args...)                          \
+       _dynamic_func_call_no_desc(fmt, btrfs_printk_ratelimited,       \
+                                  fs_info, KERN_DEBUG fmt, ##args)
 #elif defined(DEBUG)
 #define btrfs_debug(fs_info, fmt, args...) \
        btrfs_printk(fs_info, KERN_DEBUG fmt, ##args)