Skip to content

Commit

Permalink
dm-zoned: remove the ->name field in struct dmz_dev
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and Mike Snitzer committed Mar 2, 2022
1 parent f5b4aee commit 977ff73
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions drivers/md/dm-zoned-metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
dmz_zmd_debug(zmd, "read superblock set %d dev %s block %llu",
set, sb->dev->name, sb->block);
dmz_zmd_debug(zmd, "read superblock set %d dev %pg block %llu",
set, sb->dev->bdev, sb->block);

return dmz_rdwr_block(sb->dev, REQ_OP_READ,
sb->block, sb->mblk->page);
Expand Down
1 change: 0 additions & 1 deletion drivers/md/dm-zoned-target.c
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,6 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path,
}
dev->bdev = bdev;
dev->dev_idx = idx;
(void)bdevname(dev->bdev, dev->name);

dev->capacity = bdev_nr_sectors(bdev);
if (ti->begin) {
Expand Down
9 changes: 4 additions & 5 deletions drivers/md/dm-zoned.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ struct dmz_dev {
struct dmz_metadata *metadata;
struct dmz_reclaim *reclaim;

char name[BDEVNAME_SIZE];
uuid_t uuid;

sector_t capacity;
Expand Down Expand Up @@ -176,16 +175,16 @@ enum {
* Message functions.
*/
#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...) \
DMERR("(%s): " format, (dev)->name, ## args)
DMERR("(%pg): " format, (dev)->bdev, ## 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...) \
DMDEBUG("(%s): " format, (dev)->name, ## args)
DMDEBUG("(%pg): " format, (dev)->bdev, ## args)

/*
* Functions defined in dm-zoned-metadata.c
Expand Down

0 comments on commit 977ff73

Please sign in to comment.