From: Mike Snitzer <[email protected]> Prepare to bring VDO's logging closer to DM's logging by eliminating support for KERN_NOTICE log level (DM hasn't ever had a need for it).
Only one message in index-session.c used UDS_LOG_NOTICE, convert it to log with uds_log_info(). Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Bruce Johnston <[email protected]> Signed-off-by: Matthew Sakai <[email protected]> --- drivers/md/dm-vdo/index-session.c | 2 +- drivers/md/dm-vdo/logger.c | 2 -- drivers/md/dm-vdo/logger.h | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/md/dm-vdo/index-session.c b/drivers/md/dm-vdo/index-session.c index 9b5d2cacfffd..7afc19748712 100644 --- a/drivers/md/dm-vdo/index-session.c +++ b/drivers/md/dm-vdo/index-session.c @@ -378,7 +378,7 @@ int uds_open_index(enum uds_open_index_type open_type, session->parameters = *parameters; format_dev_t(name, parameters->bdev->bd_dev); - uds_log_notice("%s: %s", get_open_type_string(open_type), name); + uds_log_info("%s: %s", get_open_type_string(open_type), name); result = initialize_index_session(session, open_type); if (result != UDS_SUCCESS) diff --git a/drivers/md/dm-vdo/logger.c b/drivers/md/dm-vdo/logger.c index fe632f10b5d9..322224a07cf5 100644 --- a/drivers/md/dm-vdo/logger.c +++ b/drivers/md/dm-vdo/logger.c @@ -124,8 +124,6 @@ static void emit_log_message_to_kernel(int priority, const char *fmt, ...) printk(KERN_WARNING "%pV", &vaf); break; case UDS_LOG_NOTICE: - printk(KERN_NOTICE "%pV", &vaf); - break; case UDS_LOG_INFO: printk(KERN_INFO "%pV", &vaf); break; diff --git a/drivers/md/dm-vdo/logger.h b/drivers/md/dm-vdo/logger.h index 246aa43db9ee..09d448ff9ca9 100644 --- a/drivers/md/dm-vdo/logger.h +++ b/drivers/md/dm-vdo/logger.h @@ -74,9 +74,6 @@ int uds_vlog_strerror(int priority, int errnum, const char *module, const char * #define uds_log_info_strerror(errnum, ...) \ uds_log_strerror(UDS_LOG_INFO, errnum, __VA_ARGS__) -#define uds_log_notice_strerror(errnum, ...) \ - uds_log_strerror(UDS_LOG_NOTICE, errnum, __VA_ARGS__) - #define uds_log_warning_strerror(errnum, ...) \ uds_log_strerror(UDS_LOG_WARNING, errnum, __VA_ARGS__) @@ -93,8 +90,6 @@ void __uds_log_message(int priority, const char *module, const char *format, ... #define uds_log_info(...) uds_log_message(UDS_LOG_INFO, __VA_ARGS__) -#define uds_log_notice(...) uds_log_message(UDS_LOG_NOTICE, __VA_ARGS__) - #define uds_log_warning(...) uds_log_message(UDS_LOG_WARNING, __VA_ARGS__) #define uds_log_error(...) uds_log_message(UDS_LOG_ERR, __VA_ARGS__) -- 2.42.0
