diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-04 16:13:38 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-04 16:13:38 +0530 |
| commit | 9d427e2ef7a7dbce8e3aa310f65597600152dd7a (patch) | |
| tree | 73f0512f663ac0540a5e82fe7667942c14a07eec /block | |
| parent | 61cb2b285ecc8ee3b19c3a30653b1cf1b1aacf05 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
Merge commit 'v3.4' into android-tegra-nv-3.4
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/block/genhd.c b/block/genhd.c index dba026281a3e..53c3f7e212a7 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -743,7 +743,7 @@ void __init printk_all_partitions(void) struct hd_struct *part; char name_buf[BDEVNAME_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 @@ -762,14 +762,16 @@ void __init printk_all_partitions(void) while ((part = disk_part_iter_next(&piter))) { bool is_part0 = part == &disk->part0; - uuid[0] = 0; + uuid_buf[0] = '\0'; 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 ? "" : " ", bdevt_str(part_devt(part), devt_buf), (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 (disk->driverfs_dev != NULL && disk->driverfs_dev->driver != NULL) |