slab: Use proper formatting specs for unsigned size_t

[platform/adaptation/renesas_rcar/renesas_kernel.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 6cace66..9a289d7 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -743,7 +743,6 @@ void __init printk_all_partitions(void)
                struct hd_struct *part;
                char name_buf[BDEVNAME_SIZE];
                char devt_buf[BDEVT_SIZE];
-               char uuid_buf[PARTITION_META_INFO_UUIDLTH * 2 + 5];
 
                /*
                 * Don't show empty devices or things that have been
@@ -762,16 +761,11 @@ void __init printk_all_partitions(void)
                while ((part = disk_part_iter_next(&piter))) {
                        bool is_part0 = part == &disk->part0;
 
-                       uuid_buf[0] = '\0';
-                       if (part->info)
-                               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_read(part) >> 1
                               , disk_name(disk, part->partno, name_buf),
-                              uuid_buf);
+                              part->info ? part->info->uuid : "");
                        if (is_part0) {
                                if (disk->driverfs_dev != NULL &&
                                    disk->driverfs_dev->driver != NULL)
@@ -1245,7 +1239,7 @@ EXPORT_SYMBOL(blk_lookup_devt);
 
 struct gendisk *alloc_disk(int minors)
 {
-       return alloc_disk_node(minors, -1);
+       return alloc_disk_node(minors, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(alloc_disk);