@@ -37,14 +37,17 @@ void _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);
37
37
btrfs_no_printk(fs_info, fmt, ##args)
38
38
#endif
39
39
40
+ /*
41
+ * Print a message with filesystem info, enclosed in RCU protection.
42
+ */
40
43
#define btrfs_crit (fs_info , fmt , args ...) \
41
- btrfs_printk (fs_info, KERN_CRIT fmt, ##args)
44
+ btrfs_printk_in_rcu (fs_info, KERN_CRIT fmt, ##args)
42
45
#define btrfs_err (fs_info , fmt , args ...) \
43
- btrfs_printk (fs_info, KERN_ERR fmt, ##args)
46
+ btrfs_printk_in_rcu (fs_info, KERN_ERR fmt, ##args)
44
47
#define btrfs_warn (fs_info , fmt , args ...) \
45
- btrfs_printk (fs_info, KERN_WARNING fmt, ##args)
48
+ btrfs_printk_in_rcu (fs_info, KERN_WARNING fmt, ##args)
46
49
#define btrfs_info (fs_info , fmt , args ...) \
47
- btrfs_printk (fs_info, KERN_INFO fmt, ##args)
50
+ btrfs_printk_in_rcu (fs_info, KERN_INFO fmt, ##args)
48
51
49
52
/*
50
53
* Wrappers that use printk in RCU
@@ -74,17 +77,17 @@ void _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);
74
77
* Wrappers that use a ratelimited printk
75
78
*/
76
79
#define btrfs_crit_rl (fs_info , fmt , args ...) \
77
- btrfs_printk_ratelimited (fs_info, KERN_CRIT fmt, ##args)
80
+ btrfs_printk_rl_in_rcu (fs_info, KERN_CRIT fmt, ##args)
78
81
#define btrfs_err_rl (fs_info , fmt , args ...) \
79
- btrfs_printk_ratelimited (fs_info, KERN_ERR fmt, ##args)
82
+ btrfs_printk_rl_in_rcu (fs_info, KERN_ERR fmt, ##args)
80
83
#define btrfs_warn_rl (fs_info , fmt , args ...) \
81
- btrfs_printk_ratelimited (fs_info, KERN_WARNING fmt, ##args)
84
+ btrfs_printk_rl_in_rcu (fs_info, KERN_WARNING fmt, ##args)
82
85
#define btrfs_info_rl (fs_info , fmt , args ...) \
83
- btrfs_printk_ratelimited (fs_info, KERN_INFO fmt, ##args)
86
+ btrfs_printk_rl_in_rcu (fs_info, KERN_INFO fmt, ##args)
84
87
85
88
#if defined(CONFIG_DYNAMIC_DEBUG )
86
89
#define btrfs_debug (fs_info , fmt , args ...) \
87
- _dynamic_func_call_no_desc(fmt, btrfs_printk, \
90
+ _dynamic_func_call_no_desc(fmt, btrfs_printk_in_rcu, \
88
91
fs_info, KERN_DEBUG fmt, ##args)
89
92
#define btrfs_debug_in_rcu (fs_info , fmt , args ...) \
90
93
_dynamic_func_call_no_desc(fmt, btrfs_printk_in_rcu, \
@@ -93,26 +96,26 @@ void _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);
93
96
_dynamic_func_call_no_desc(fmt, btrfs_printk_rl_in_rcu, \
94
97
fs_info, KERN_DEBUG fmt, ##args)
95
98
#define btrfs_debug_rl (fs_info , fmt , args ...) \
96
- _dynamic_func_call_no_desc(fmt, btrfs_printk_ratelimited, \
99
+ _dynamic_func_call_no_desc(fmt, btrfs_printk_rl_in_rcu, \
97
100
fs_info, KERN_DEBUG fmt, ##args)
98
101
#elif defined(DEBUG )
99
102
#define btrfs_debug (fs_info , fmt , args ...) \
100
- btrfs_printk (fs_info, KERN_DEBUG fmt, ##args)
103
+ btrfs_printk_in_rcu (fs_info, KERN_DEBUG fmt, ##args)
101
104
#define btrfs_debug_in_rcu (fs_info , fmt , args ...) \
102
105
btrfs_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)
103
106
#define btrfs_debug_rl_in_rcu (fs_info , fmt , args ...) \
104
107
btrfs_printk_rl_in_rcu(fs_info, KERN_DEBUG fmt, ##args)
105
108
#define btrfs_debug_rl (fs_info , fmt , args ...) \
106
- btrfs_printk_ratelimited (fs_info, KERN_DEBUG fmt, ##args)
109
+ btrfs_printk_rl_in_rcu (fs_info, KERN_DEBUG fmt, ##args)
107
110
#else
108
111
#define btrfs_debug (fs_info , fmt , args ...) \
109
- btrfs_no_printk (fs_info, KERN_DEBUG fmt, ##args)
112
+ btrfs_no_printk_in_rcu (fs_info, KERN_DEBUG fmt, ##args)
110
113
#define btrfs_debug_in_rcu (fs_info , fmt , args ...) \
111
114
btrfs_no_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)
112
115
#define btrfs_debug_rl_in_rcu (fs_info , fmt , args ...) \
113
116
btrfs_no_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)
114
117
#define btrfs_debug_rl (fs_info , fmt , args ...) \
115
- btrfs_no_printk (fs_info, KERN_DEBUG fmt, ##args)
118
+ btrfs_no_printk_in_rcu (fs_info, KERN_DEBUG fmt, ##args)
116
119
#endif
117
120
118
121
#define btrfs_printk_in_rcu (fs_info , fmt , args ...) \
0 commit comments