Commit 977ff73e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Mike Snitzer

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent f5b4aee1
...@@ -1101,8 +1101,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, struct dmz_sb *dsb, ...@@ -1101,8 +1101,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, struct dmz_sb *dsb,
*/ */
static int dmz_read_sb(struct dmz_metadata *zmd, struct dmz_sb *sb, int set) static int dmz_read_sb(struct dmz_metadata *zmd, struct dmz_sb *sb, int set)
{ {
dmz_zmd_debug(zmd, "read superblock set %d dev %s block %llu", dmz_zmd_debug(zmd, "read superblock set %d dev %pg block %llu",
set, sb->dev->name, sb->block); set, sb->dev->bdev, sb->block);
return dmz_rdwr_block(sb->dev, REQ_OP_READ, return dmz_rdwr_block(sb->dev, REQ_OP_READ,
sb->block, sb->mblk->page); sb->block, sb->mblk->page);
......
...@@ -730,7 +730,6 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path, ...@@ -730,7 +730,6 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path,
} }
dev->bdev = bdev; dev->bdev = bdev;
dev->dev_idx = idx; dev->dev_idx = idx;
(void)bdevname(dev->bdev, dev->name);
dev->capacity = bdev_nr_sectors(bdev); dev->capacity = bdev_nr_sectors(bdev);
if (ti->begin) { if (ti->begin) {
......
...@@ -56,7 +56,6 @@ struct dmz_dev { ...@@ -56,7 +56,6 @@ struct dmz_dev {
struct dmz_metadata *metadata; struct dmz_metadata *metadata;
struct dmz_reclaim *reclaim; struct dmz_reclaim *reclaim;
char name[BDEVNAME_SIZE];
uuid_t uuid; uuid_t uuid;
sector_t capacity; sector_t capacity;
...@@ -176,16 +175,16 @@ enum { ...@@ -176,16 +175,16 @@ enum {
* Message functions. * Message functions.
*/ */
#define dmz_dev_info(dev, format, args...) \ #define dmz_dev_info(dev, format, args...) \
DMINFO("(%s): " format, (dev)->name, ## args) DMINFO("(%pg): " format, (dev)->bdev, ## args)
#define dmz_dev_err(dev, format, args...) \ #define dmz_dev_err(dev, format, args...) \
DMERR("(%s): " format, (dev)->name, ## args) DMERR("(%pg): " format, (dev)->bdev, ## args)
#define dmz_dev_warn(dev, format, args...) \ #define dmz_dev_warn(dev, format, args...) \
DMWARN("(%s): " format, (dev)->name, ## args) DMWARN("(%pg): " format, (dev)->bdev, ## args)
#define dmz_dev_debug(dev, format, args...) \ #define dmz_dev_debug(dev, format, args...) \
DMDEBUG("(%s): " format, (dev)->name, ## args) DMDEBUG("(%pg): " format, (dev)->bdev, ## args)
/* /*
* Functions defined in dm-zoned-metadata.c * Functions defined in dm-zoned-metadata.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment