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

block: remove disk_name() 



Remove the disk_name function now that all users are gone.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20210727062518.122108-7-hch@lst.de


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

block/blk.h

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ static inline void blk_queue_clear_zone_settings(struct request_queue *q) {} 


int blk_alloc_ext_minor(void);

void blk_free_ext_minor(unsigned int minor);

char *disk_name(struct gendisk *hd, int partno, char *buf);

#define ADDPART_FLAG_NONE	0

#define ADDPART_FLAG_RAID	1

#define ADDPART_FLAG_WHOLEDISK	2

block/genhd.c

+9 −8
Original line number Diff line number Diff line
@@ -78,11 +78,17 @@ 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 disk into the supplied buffer and

 * return a pointer to that same buffer for convenience.

 * 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.

 */

char *disk_name(struct gendisk *hd, int partno, char *buf)

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]))
@@ -92,11 +98,6 @@ char *disk_name(struct gendisk *hd, int partno, char *buf) 


	return buf;

}



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

{

	return disk_name(bdev->bd_disk, bdev->bd_partno, buf);

}

EXPORT_SYMBOL(bdevname);



static void part_stat_read_all(struct block_device *part,