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

block: simplify printing the device names disk_stack_limits 



Printk ->disk_name directly for the disk and use the %pg format specifier
for the block device, which is equivalent to a bdevname call.

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-5-hch@lst.de


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

block/blk-settings.c

+3 −9
Original line number Diff line number Diff line
@@ -661,15 +661,9 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, 
	struct request_queue *t = disk->queue;



	if (blk_stack_limits(&t->limits, &bdev_get_queue(bdev)->limits,

			get_start_sect(bdev) + (offset >> 9)) < 0) {

		char top[BDEVNAME_SIZE], bottom[BDEVNAME_SIZE];



		disk_name(disk, 0, top);

		bdevname(bdev, bottom);



		printk(KERN_NOTICE "%s: Warning: Device %s is misaligned\n",

		       top, bottom);

	}

			get_start_sect(bdev) + (offset >> 9)) < 0)

		pr_notice("%s: Warning: Device %pg is misaligned\n",

			disk->disk_name, bdev);



	blk_queue_update_readahead(disk->queue);

}