Merge tag 'perf-core-for-mingo-5.3-20190709' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 24654e1d83e6025dcd98ea7d2236fc27cd3397be..97887e59f3b2a34dfde5272bb0d3226e63bad15a 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1281,7 +1281,6 @@ int disk_expand_part_tbl(struct gendisk *disk, int partno)
        struct disk_part_tbl *new_ptbl;
        int len = old_ptbl ? old_ptbl->len : 0;
        int i, target;
-       size_t size;
 
        /*
         * check for int overflow, since we can get here from blkpg_ioctl()
@@ -1298,8 +1297,8 @@ int disk_expand_part_tbl(struct gendisk *disk, int partno)
        if (target <= len)
                return 0;
 
-       size = sizeof(*new_ptbl) + target * sizeof(new_ptbl->part[0]);
-       new_ptbl = kzalloc_node(size, GFP_KERNEL, disk->node_id);
+       new_ptbl = kzalloc_node(struct_size(new_ptbl, part, target), GFP_KERNEL,
+                               disk->node_id);
        if (!new_ptbl)
                return -ENOMEM;