Re: [PATCH 3/4] null_blk: format pr_* logs with pr_fmt

[Chaitanya Kulkarni]

On 09/13/2019 12:00 PM, André Almeida wrote:
> Instead of writing "null_blk: " at the beginning of each pr_err/info/warn
Please limit above line to 72 character.
> log message, format messages using pr_fmt() macro. Change the order of
> includes to prevent '"pr_fmt" redefined' warning messages.
Why change the order of headers ? Can we use #undef  ?

This change of order for block driver looks bit odd as compare to
othe kernel block driver source code.

See :- drivers/scsi, drivers/nvme.
>
> Signed-off-by: André Almeida <andrealmeid@xxxxxxxxxxxxx>
> ---
>   drivers/block/null_blk.h       |  4 +++-
>   drivers/block/null_blk_main.c  | 18 +++++++++---------
>   drivers/block/null_blk_zoned.c |  6 +++---
>   3 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/block/null_blk.h b/drivers/block/null_blk.h
> index a1b9929bd911..2d2183320be2 100644
> --- a/drivers/block/null_blk.h
> +++ b/drivers/block/null_blk.h
> @@ -2,6 +2,8 @@
>   #ifndef __BLK_NULL_BLK_H
>   #define __BLK_NULL_BLK_H
>
> +#define pr_fmt(fmt) "null_blk: " fmt
Is there a reason why KBUILD_MODNAME is not used here ?
> +
>   #include <linux/blkdev.h>
>   #include <linux/slab.h>
>   #include <linux/blk-mq.h>
> @@ -96,7 +98,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..081ca55bb0a6 100644
> --- a/drivers/block/null_blk_main.c
> +++ b/drivers/block/null_blk_main.c
> @@ -3,13 +3,13 @@
>    * Add configfs and memory store: Kyungchan Koh <kkc6196@xxxxxx> and
>    * Shaohua Li <shli@xxxxxx>
>    */
> +#include "null_blk.h"
>   #include <linux/module.h>
>
>   #include <linux/moduleparam.h>
>   #include <linux/sched.h>
>   #include <linux/fs.h>
>   #include <linux/init.h>
> -#include "null_blk.h"

Unless there is a strong reason we should avoid this change ?

>
>   #define PAGE_SECTORS_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)
>   #define PAGE_SECTORS		(1 << PAGE_SECTORS_SHIFT)
> @@ -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..670f9cf79d80 100644
> --- a/drivers/block/null_blk_zoned.c
> +++ b/drivers/block/null_blk_zoned.c
> @@ -1,6 +1,6 @@
>   // SPDX-License-Identifier: GPL-2.0
> -#include <linux/vmalloc.h>
>   #include "null_blk.h"
> +#include <linux/vmalloc.h>
Same here.
>
>   /* zone_size in MBs to sectors. */
>   #define ZONE_SIZE_SHIFT		11
> @@ -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);
>   	}
>
>