From: Christoph Hellwig Date: Tue, 27 Jul 2021 06:25:17 +0000 (+0200) Subject: block: simplify disk name formatting in check_partition X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1d7035478f64c040441c9cb2aa32e0d7fae526d2;p=linux.git block: simplify disk name formatting in check_partition disk_name for partition 0 just copies out the disk_name field. Replace the call to disk_name with a %s format specifier. Signed-off-by: Christoph Hellwig Reviewed-by: Martin K. Petersen Link: https://lore.kernel.org/r/20210727062518.122108-6-hch@lst.de Signed-off-by: Jens Axboe --- diff --git a/block/partitions/core.c b/block/partitions/core.c index 2415bffc27716..fb3a556cacce3 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -136,7 +136,7 @@ static struct parsed_partitions *check_partition(struct gendisk *hd) state->pp_buf[0] = '\0'; state->bdev = hd->part0; - disk_name(hd, 0, state->name); + snprintf(state->name, BDEVNAME_SIZE, "%s", hd->disk_name); snprintf(state->pp_buf, PAGE_SIZE, " %s:", state->name); if (isdigit(state->name[strlen(state->name)-1])) sprintf(state->name, "p");