summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2025-06-09 19:09:31 +0200
committerDavid Sterba <dsterba@suse.com>2025-07-21 23:56:39 +0200
commitb37532bffd35374b7816ef0629e8a1bbf12dc30b (patch)
tree2cb60d8d3d6c1bb2deefd9b9e2b16e1af75c08ac
parent2f3f1ad7f1792d0a6535a2da39d114a12902588d (diff)
btrfs: merge btrfs_printk_ratelimited() and its only caller
There's only one caller of btrfs_printk_ratelimited(), merge it there. Reviewed-by: Daniel Vacek <neelx@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/messages.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/btrfs/messages.h b/fs/btrfs/messages.h
index 483524fccdc0..022ebc89af85 100644
--- a/fs/btrfs/messages.h
+++ b/fs/btrfs/messages.h
@@ -86,19 +86,15 @@ do { \
rcu_read_unlock(); \
} while (0)
-#define btrfs_printk_ratelimited(fs_info, fmt, args...) \
+#define btrfs_printk_rl_in_rcu(fs_info, fmt, args...) \
do { \
static DEFINE_RATELIMIT_STATE(_rs, \
DEFAULT_RATELIMIT_INTERVAL, \
DEFAULT_RATELIMIT_BURST); \
+ \
+ rcu_read_lock(); \
if (__ratelimit(&_rs)) \
btrfs_printk(fs_info, fmt, ##args); \
-} while (0)
-
-#define btrfs_printk_rl_in_rcu(fs_info, fmt, args...) \
-do { \
- rcu_read_lock(); \
- btrfs_printk_ratelimited(fs_info, fmt, ##args); \
rcu_read_unlock(); \
} while (0)