lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 055/147] dm: convert DM printk macros to pr_<level> macros
    3.2.95-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Joe Perches <joe@perches.com>

    commit d2c3c8dcb5987b8352e82089c79a41b6e17e28d2 upstream.

    Using pr_<level> is the more common logging style.

    Standardize style and use new macro DM_FMT.
    Use no_printk in DMDEBUG macros when CONFIG_DM_DEBUG is not #defined.

    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    include/linux/device-mapper.h | 71 +++++++++++++++++++------------------------
    1 file changed, 32 insertions(+), 39 deletions(-)

    --- a/include/linux/device-mapper.h
    +++ b/include/linux/device-mapper.h
    @@ -406,48 +406,41 @@ extern struct ratelimit_state dm_ratelim
    #define dm_ratelimit() 0
    #endif

    -#define DMCRIT(f, arg...) \
    - printk(KERN_CRIT DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
    +#define DM_FMT(fmt) DM_NAME ": " DM_MSG_PREFIX ": " fmt "\n"

    -#define DMERR(f, arg...) \
    - printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
    -#define DMERR_LIMIT(f, arg...) \
    - do { \
    - if (dm_ratelimit()) \
    - printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " \
    - f "\n", ## arg); \
    - } while (0)
    -
    -#define DMWARN(f, arg...) \
    - printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
    -#define DMWARN_LIMIT(f, arg...) \
    - do { \
    - if (dm_ratelimit()) \
    - printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " \
    - f "\n", ## arg); \
    - } while (0)
    -
    -#define DMINFO(f, arg...) \
    - printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
    -#define DMINFO_LIMIT(f, arg...) \
    - do { \
    - if (dm_ratelimit()) \
    - printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f \
    - "\n", ## arg); \
    - } while (0)
    +#define DMCRIT(fmt, ...) pr_crit(DM_FMT(fmt), ##__VA_ARGS__)
    +
    +#define DMERR(fmt, ...) pr_err(DM_FMT(fmt), ##__VA_ARGS__)
    +#define DMERR_LIMIT(fmt, ...) \
    +do { \
    + if (dm_ratelimit()) \
    + DMERR(fmt, ##__VA_ARGS__); \
    +} while (0)
    +
    +#define DMWARN(fmt, ...) pr_warn(DM_FMT(fmt), ##__VA_ARGS__)
    +#define DMWARN_LIMIT(fmt, ...) \
    +do { \
    + if (dm_ratelimit()) \
    + DMWARN(fmt, ##__VA_ARGS__); \
    +} while (0)
    +
    +#define DMINFO(fmt, ...) pr_info(DM_FMT(fmt), ##__VA_ARGS__)
    +#define DMINFO_LIMIT(fmt, ...) \
    +do { \
    + if (dm_ratelimit()) \
    + DMINFO(fmt, ##__VA_ARGS__); \
    +} while (0)

    #ifdef CONFIG_DM_DEBUG
    -# define DMDEBUG(f, arg...) \
    - printk(KERN_DEBUG DM_NAME ": " DM_MSG_PREFIX " DEBUG: " f "\n", ## arg)
    -# define DMDEBUG_LIMIT(f, arg...) \
    - do { \
    - if (dm_ratelimit()) \
    - printk(KERN_DEBUG DM_NAME ": " DM_MSG_PREFIX ": " f \
    - "\n", ## arg); \
    - } while (0)
    +#define DMDEBUG(fmt, ...) printk(KERN_DEBUG DM_FMT(fmt), ##__VA_ARGS__)
    +#define DMDEBUG_LIMIT(fmt, ...) \
    +do { \
    + if (dm_ratelimit()) \
    + DMDEBUG(fmt, ##__VA_ARGS__); \
    +} while (0)
    #else
    -# define DMDEBUG(f, arg...) do {} while (0)
    -# define DMDEBUG_LIMIT(f, arg...) do {} while (0)
    +#define DMDEBUG(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
    +#define DMDEBUG_LIMIT(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
    #endif

    #define DMEMIT(x...) sz += ((sz >= maxlen) ? \
    \
     
     \ /
      Last update: 2017-11-08 20:57    [W:2.711 / U:0.716 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site