|
@@ -743,7 +743,7 @@ void __init printk_all_partitions(void)
|
|
struct hd_struct *part;
|
|
struct hd_struct *part;
|
|
char name_buf[BDEVNAME_SIZE];
|
|
char name_buf[BDEVNAME_SIZE];
|
|
char devt_buf[BDEVT_SIZE];
|
|
char devt_buf[BDEVT_SIZE];
|
|
- u8 uuid[PARTITION_META_INFO_UUIDLTH * 2 + 1];
|
|
|
|
|
|
+ char uuid_buf[PARTITION_META_INFO_UUIDLTH * 2 + 5];
|
|
|
|
|
|
/*
|
|
/*
|
|
* Don't show empty devices or things that have been
|
|
* Don't show empty devices or things that have been
|
|
@@ -762,14 +762,16 @@ void __init printk_all_partitions(void)
|
|
while ((part = disk_part_iter_next(&piter))) {
|
|
while ((part = disk_part_iter_next(&piter))) {
|
|
bool is_part0 = part == &disk->part0;
|
|
bool is_part0 = part == &disk->part0;
|
|
|
|
|
|
- uuid[0] = 0;
|
|
|
|
|
|
+ uuid_buf[0] = '\0';
|
|
if (part->info)
|
|
if (part->info)
|
|
- part_unpack_uuid(part->info->uuid, uuid);
|
|
|
|
|
|
+ snprintf(uuid_buf, sizeof(uuid_buf), "%pU",
|
|
|
|
+ part->info->uuid);
|
|
|
|
|
|
printk("%s%s %10llu %s %s", is_part0 ? "" : " ",
|
|
printk("%s%s %10llu %s %s", is_part0 ? "" : " ",
|
|
bdevt_str(part_devt(part), devt_buf),
|
|
bdevt_str(part_devt(part), devt_buf),
|
|
(unsigned long long)part->nr_sects >> 1,
|
|
(unsigned long long)part->nr_sects >> 1,
|
|
- disk_name(disk, part->partno, name_buf), uuid);
|
|
|
|
|
|
+ disk_name(disk, part->partno, name_buf),
|
|
|
|
+ uuid_buf);
|
|
if (is_part0) {
|
|
if (is_part0) {
|
|
if (disk->driverfs_dev != NULL &&
|
|
if (disk->driverfs_dev != NULL &&
|
|
disk->driverfs_dev->driver != NULL)
|
|
disk->driverfs_dev->driver != NULL)
|