| Message ID | 20220420005718.3780004-4-damien.lemoal@opensource.wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | null_blk cleanup and device naming improvements | expand |
On 4/19/22 17:57, Damien Le Moal wrote: > Use the pr_fmt() macro to prefix all null_blk pr_xxx() messages with > "null_blk:" to clarify which module is printing the messages. Also add > a pr_info() message in null_add_dev() to print the name of a newly > created disk. > > Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> > --- why not [1] to keep #define pr_fmt at one place in header file instead of duplicating it in zoned.c main.c ? irrespective of that, looks good. Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> -ck [1] diff --git a/drivers/block/null_blk/null_blk.h b/drivers/block/null_blk/null_blk.h index 78eb56b0ca55..450849fb3038 100644 --- a/drivers/block/null_blk/null_blk.h +++ b/drivers/block/null_blk/null_blk.h @@ -167,4 +167,8 @@ static inline size_t null_zone_valid_read_len(struct nullb *nullb, } #define null_report_zones NULL #endif /* CONFIG_BLK_DEV_ZONED */ + +#undef pr_fmt +#define pr_fmt(fmt) "null_blk: " fmt + #endif /* __NULL_BLK_H */
On 4/20/22 12:57, Chaitanya Kulkarni wrote: > On 4/19/22 17:57, Damien Le Moal wrote: >> Use the pr_fmt() macro to prefix all null_blk pr_xxx() messages with >> "null_blk:" to clarify which module is printing the messages. Also add >> a pr_info() message in null_add_dev() to print the name of a newly >> created disk. >> >> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> >> --- > > why not [1] to keep #define pr_fmt at one place in header file > instead of duplicating it in zoned.c main.c ? > > irrespective of that, looks good. > > Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> > > -ck > > > [1] > > diff --git a/drivers/block/null_blk/null_blk.h > b/drivers/block/null_blk/null_blk.h > index 78eb56b0ca55..450849fb3038 100644 > --- a/drivers/block/null_blk/null_blk.h > +++ b/drivers/block/null_blk/null_blk.h > @@ -167,4 +167,8 @@ static inline size_t null_zone_valid_read_len(struct > nullb *nullb, > } > #define null_report_zones NULL > #endif /* CONFIG_BLK_DEV_ZONED */ > + > +#undef pr_fmt > +#define pr_fmt(fmt) "null_blk: " fmt > + > #endif /* __NULL_BLK_H */ Right, could do that. Jens ? Do you want an update for this ?
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index 4d6bc94086da..7bc36d5114a9 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -11,6 +11,9 @@ #include <linux/init.h> #include "null_blk.h" +#undef pr_fmt +#define pr_fmt(fmt) "null_blk: " fmt + #define FREE_BATCH 16 #define TICKS_PER_SEC 50ULL @@ -2071,6 +2074,8 @@ static int null_add_dev(struct nullb_device *dev) list_add_tail(&nullb->list, &nullb_list); mutex_unlock(&lock); + pr_info("disk %s created\n", nullb->disk_name); + return 0; out_cleanup_zone: null_free_zoned_dev(dev); diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c index dae54dd1aeac..ed158ea4fdd1 100644 --- a/drivers/block/null_blk/zoned.c +++ b/drivers/block/null_blk/zoned.c @@ -6,6 +6,9 @@ #define CREATE_TRACE_POINTS #include "trace.h" +#undef pr_fmt +#define pr_fmt(fmt) "null_blk: " fmt + static inline sector_t mb_to_sects(unsigned long mb) { return ((sector_t)mb * SZ_1M) >> SECTOR_SHIFT; @@ -75,8 +78,8 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q) dev->zone_capacity = dev->zone_size; if (dev->zone_capacity > dev->zone_size) { - pr_err("null_blk: zone capacity (%lu MB) larger than zone size (%lu MB)\n", - dev->zone_capacity, dev->zone_size); + pr_err("zone capacity (%lu MB) larger than zone size (%lu MB)\n", + dev->zone_capacity, dev->zone_size); return -EINVAL; }
Use the pr_fmt() macro to prefix all null_blk pr_xxx() messages with "null_blk:" to clarify which module is printing the messages. Also add a pr_info() message in null_add_dev() to print the name of a newly created disk. Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> --- drivers/block/null_blk/main.c | 5 +++++ drivers/block/null_blk/zoned.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)