lkml.org 
[lkml]   [2019]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/4] null_blk: format pr_* logs with pr_fmt
    Date
    Instead of writing "null_blk: " at the beginning of each
    pr_err/info/warn log message, format messages using pr_fmt() macro.

    Signed-off-by: André Almeida <andrealmeid@collabora.com>
    ---
    Changes from v1:
    - Use #undef instead of reorder #includes
    - Use KBUILD_MODNAME instead of using the hardcoded module name
    ---
    drivers/block/null_blk.h | 5 ++++-
    drivers/block/null_blk_main.c | 16 ++++++++--------
    drivers/block/null_blk_zoned.c | 4 ++--
    3 files changed, 14 insertions(+), 11 deletions(-)

    diff --git a/drivers/block/null_blk.h b/drivers/block/null_blk.h
    index a1b9929bd911..8a65cb549dd5 100644
    --- a/drivers/block/null_blk.h
    +++ b/drivers/block/null_blk.h
    @@ -2,6 +2,9 @@
    #ifndef __BLK_NULL_BLK_H
    #define __BLK_NULL_BLK_H

    +#undef pr_fmt
    +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
    +
    #include <linux/blkdev.h>
    #include <linux/slab.h>
    #include <linux/blk-mq.h>
    @@ -96,7 +99,7 @@ void null_zone_reset(struct nullb_cmd *cmd, sector_t sector);
    #else
    static inline int null_zone_init(struct nullb_device *dev)
    {
    - pr_err("null_blk: CONFIG_BLK_DEV_ZONED not enabled\n");
    + pr_err("CONFIG_BLK_DEV_ZONED not enabled\n");
    return -EINVAL;
    }
    static inline void null_zone_exit(struct nullb_device *dev) {}
    diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
    index 5d20d65041bd..3821fdb85c94 100644
    --- a/drivers/block/null_blk_main.c
    +++ b/drivers/block/null_blk_main.c
    @@ -1311,7 +1311,7 @@ static bool should_requeue_request(struct request *rq)

    static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res)
    {
    - pr_info("null_blk: rq %p timed out\n", rq);
    + pr_info("rq %p timed out\n", rq);
    blk_mq_complete_request(rq);
    return BLK_EH_DONE;
    }
    @@ -1739,28 +1739,28 @@ static int __init null_init(void)
    struct nullb_device *dev;

    if (g_bs > PAGE_SIZE) {
    - pr_warn("null_blk: invalid block size\n");
    - pr_warn("null_blk: defaults block size to %lu\n", PAGE_SIZE);
    + pr_warn("invalid block size\n");
    + pr_warn("defaults block size to %lu\n", PAGE_SIZE);
    g_bs = PAGE_SIZE;
    }

    if (!is_power_of_2(g_zone_size)) {
    - pr_err("null_blk: zone_size must be power-of-two\n");
    + pr_err("zone_size must be power-of-two\n");
    return -EINVAL;
    }

    if (g_home_node != NUMA_NO_NODE && g_home_node >= nr_online_nodes) {
    - pr_err("null_blk: invalid home_node value\n");
    + pr_err("invalid home_node value\n");
    g_home_node = NUMA_NO_NODE;
    }

    if (g_queue_mode == NULL_Q_RQ) {
    - pr_err("null_blk: legacy IO path no longer available\n");
    + pr_err("legacy IO path no longer available\n");
    return -EINVAL;
    }
    if (g_queue_mode == NULL_Q_MQ && g_use_per_node_hctx) {
    if (g_submit_queues != nr_online_nodes) {
    - pr_warn("null_blk: submit_queues param is set to %u.\n",
    + pr_warn("submit_queues param is set to %u.\n",
    nr_online_nodes);
    g_submit_queues = nr_online_nodes;
    }
    @@ -1803,7 +1803,7 @@ static int __init null_init(void)
    }
    }

    - pr_info("null_blk: module loaded\n");
    + pr_info("module loaded\n");
    return 0;

    err_dev:
    diff --git a/drivers/block/null_blk_zoned.c b/drivers/block/null_blk_zoned.c
    index cb28d93f2bd1..b2b977be5ddd 100644
    --- a/drivers/block/null_blk_zoned.c
    +++ b/drivers/block/null_blk_zoned.c
    @@ -17,7 +17,7 @@ int null_zone_init(struct nullb_device *dev)
    unsigned int i;

    if (!is_power_of_2(dev->zone_size)) {
    - pr_err("null_blk: zone_size must be power-of-two\n");
    + pr_err("zone_size must be power-of-two\n");
    return -EINVAL;
    }

    @@ -31,7 +31,7 @@ int null_zone_init(struct nullb_device *dev)

    if (dev->zone_nr_conv >= dev->nr_zones) {
    dev->zone_nr_conv = dev->nr_zones - 1;
    - pr_info("null_blk: changed the number of conventional zones to %u",
    + pr_info("changed the number of conventional zones to %u",
    dev->zone_nr_conv);
    }

    --
    2.23.0
    \
     
     \ /
      Last update: 2019-09-14 00:05    [W:3.656 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site