Commit 900d156b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove bdevname 



Replace the remaining calls of bdevname with snprintf using the %pg
format specifier.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220713055317.1888500-10-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c5b045b9

block/genhd.c

+0 −23
Original line number Diff line number Diff line
@@ -101,29 +101,6 @@ bool set_capacity_and_notify(struct gendisk *disk, sector_t size) 
}

EXPORT_SYMBOL_GPL(set_capacity_and_notify);



/*

 * Format the device name of the indicated block device into the supplied buffer

 * and return a pointer to that same buffer for convenience.

 *

 * Note: do not use this in new code, use the %pg specifier to sprintf and

 * printk insted.

 */

const char *bdevname(struct block_device *bdev, char *buf)

{

	struct gendisk *hd = bdev->bd_disk;

	int partno = bdev->bd_partno;



	if (!partno)

		snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name);

	else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1]))

		snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno);

	else

		snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno);



	return buf;

}

EXPORT_SYMBOL(bdevname);



static void part_stat_read_all(struct block_device *part,

		struct disk_stats *stat)

{

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -2438,7 +2438,7 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev) 
			mdname(mddev), mddev->max_disks);

		return -EBUSY;

	}

	bdevname(rdev->bdev,b);

	snprintf(b, sizeof(b), "%pg", rdev->bdev);

	strreplace(b, '/', '!');



	rdev->mddev = mddev;

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio, 
		rcu_read_lock();

		rdev = rcu_dereference(conf->mirrors[r1_bio->read_disk].rdev);

		if (rdev)

			bdevname(rdev->bdev, b);

			snprintf(b, sizeof(b), "%pg", rdev->bdev);

		else

			strcpy(b, "???");

		rcu_read_unlock();

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, 
		disk = r10_bio->devs[slot].devnum;

		err_rdev = rcu_dereference(conf->mirrors[disk].rdev);

		if (err_rdev)

			bdevname(err_rdev->bdev, b);

			snprintf(b, sizeof(b), "%pg", err_rdev->bdev);

		else {

			strcpy(b, "???");

			/* This never gets dereferenced */

fs/ext4/mmp.c

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ int ext4_multi_mount_protect(struct super_block *sb, 
	EXT4_SB(sb)->s_mmp_bh = bh;



	BUILD_BUG_ON(sizeof(mmp->mmp_bdevname) < BDEVNAME_SIZE);

	bdevname(bh->b_bdev, mmp->mmp_bdevname);

	snprintf(mmp->mmp_bdevname, sizeof(mmp->mmp_bdevname),

		 "%pg", bh->b_bdev);



	/*

	 * Start a kernel thread to update the MMP block periodically.