Skip to content

Commit 977ff73

Browse files
Christoph Hellwigsnitm
authored andcommitted
dm-zoned: remove the ->name field in struct dmz_dev
Just use the %pg format specifier to print the block device name directly. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
1 parent f5b4aee commit 977ff73

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

drivers/md/dm-zoned-metadata.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,8 +1101,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, struct dmz_sb *dsb,
11011101
*/
11021102
static int dmz_read_sb(struct dmz_metadata *zmd, struct dmz_sb *sb, int set)
11031103
{
1104-
dmz_zmd_debug(zmd, "read superblock set %d dev %s block %llu",
1105-
set, sb->dev->name, sb->block);
1104+
dmz_zmd_debug(zmd, "read superblock set %d dev %pg block %llu",
1105+
set, sb->dev->bdev, sb->block);
11061106

11071107
return dmz_rdwr_block(sb->dev, REQ_OP_READ,
11081108
sb->block, sb->mblk->page);

drivers/md/dm-zoned-target.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,6 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path,
730730
}
731731
dev->bdev = bdev;
732732
dev->dev_idx = idx;
733-
(void)bdevname(dev->bdev, dev->name);
734733

735734
dev->capacity = bdev_nr_sectors(bdev);
736735
if (ti->begin) {

drivers/md/dm-zoned.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ struct dmz_dev {
5656
struct dmz_metadata *metadata;
5757
struct dmz_reclaim *reclaim;
5858

59-
char name[BDEVNAME_SIZE];
6059
uuid_t uuid;
6160

6261
sector_t capacity;
@@ -176,16 +175,16 @@ enum {
176175
* Message functions.
177176
*/
178177
#define dmz_dev_info(dev, format, args...) \
179-
DMINFO("(%s): " format, (dev)->name, ## args)
178+
DMINFO("(%pg): " format, (dev)->bdev, ## args)
180179

181180
#define dmz_dev_err(dev, format, args...) \
182-
DMERR("(%s): " format, (dev)->name, ## args)
181+
DMERR("(%pg): " format, (dev)->bdev, ## args)
183182

184183
#define dmz_dev_warn(dev, format, args...) \
185-
DMWARN("(%s): " format, (dev)->name, ## args)
184+
DMWARN("(%pg): " format, (dev)->bdev, ## args)
186185

187186
#define dmz_dev_debug(dev, format, args...) \
188-
DMDEBUG("(%s): " format, (dev)->name, ## args)
187+
DMDEBUG("(%pg): " format, (dev)->bdev, ## args)
189188

190189
/*
191190
* Functions defined in dm-zoned-metadata.c

0 commit comments

Comments
 (0)