Skip to content

Commit 733232f

Browse files
committed
dm: use printk ratelimiting functions
DM provided its own ratelimiting printk wrapper but given printk advances this is no longer needed. Also, switching DMDEBUG_LIMIT to using pr_debug_ratelimited() fixes the reported issue where DMDEBUG_LIMIT() still caused a flood of "callbacks suppressed" messages. Reported-by: Milan Broz <[email protected]> Depends-on: 29fc2bc ("printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages") Signed-off-by: Mike Snitzer <[email protected]>
1 parent c663e04 commit 733232f

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

include/linux/device-mapper.h

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -530,29 +530,20 @@ void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size);
530530
*---------------------------------------------------------------*/
531531
#define DM_NAME "device-mapper"
532532

533-
#define DM_RATELIMIT(pr_func, fmt, ...) \
534-
do { \
535-
static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL, \
536-
DEFAULT_RATELIMIT_BURST); \
537-
\
538-
if (__ratelimit(&rs)) \
539-
pr_func(DM_FMT(fmt), ##__VA_ARGS__); \
540-
} while (0)
541-
542533
#define DM_FMT(fmt) DM_NAME ": " DM_MSG_PREFIX ": " fmt "\n"
543534

544535
#define DMCRIT(fmt, ...) pr_crit(DM_FMT(fmt), ##__VA_ARGS__)
545536

546537
#define DMERR(fmt, ...) pr_err(DM_FMT(fmt), ##__VA_ARGS__)
547-
#define DMERR_LIMIT(fmt, ...) DM_RATELIMIT(pr_err, fmt, ##__VA_ARGS__)
538+
#define DMERR_LIMIT(fmt, ...) pr_err_ratelimited(DM_FMT(fmt), ##__VA_ARGS__)
548539
#define DMWARN(fmt, ...) pr_warn(DM_FMT(fmt), ##__VA_ARGS__)
549-
#define DMWARN_LIMIT(fmt, ...) DM_RATELIMIT(pr_warn, fmt, ##__VA_ARGS__)
540+
#define DMWARN_LIMIT(fmt, ...) pr_warn_ratelimited(DM_FMT(fmt), ##__VA_ARGS__)
550541
#define DMINFO(fmt, ...) pr_info(DM_FMT(fmt), ##__VA_ARGS__)
551-
#define DMINFO_LIMIT(fmt, ...) DM_RATELIMIT(pr_info, fmt, ##__VA_ARGS__)
542+
#define DMINFO_LIMIT(fmt, ...) pr_info_ratelimited(DM_FMT(fmt), ##__VA_ARGS__)
552543

553544
#ifdef CONFIG_DM_DEBUG
554545
#define DMDEBUG(fmt, ...) printk(KERN_DEBUG DM_FMT(fmt), ##__VA_ARGS__)
555-
#define DMDEBUG_LIMIT(fmt, ...) DM_RATELIMIT(pr_debug, fmt, ##__VA_ARGS__)
546+
#define DMDEBUG_LIMIT(fmt, ...) pr_debug_ratelimited(DM_FMT(fmt), ##__VA_ARGS__)
556547
#else
557548
#define DMDEBUG(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
558549
#define DMDEBUG_LIMIT(fmt, ...) no_printk(fmt, ##__VA_ARGS__)

0 commit comments

Comments
 (0)