block: simplify disk name formatting in check_partition
authorChristoph Hellwig <hch@lst.de>
Tue, 27 Jul 2021 06:25:17 +0000 (08:25 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 2 Aug 2021 19:37:28 +0000 (13:37 -0600)
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 <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20210727062518.122108-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/partitions/core.c

index 2415bff..fb3a556 100644 (file)
@@ -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");