[PATCH 1/3] lib: assoc_array: use struct_size() in kmalloc()

[xiaolinkui]

Use the new struct_size() helper to keep code simple.

Signed-off-by: xiaolinkui <xiaolin...@kylinos.cn>
---
 lib/assoc_array.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index edc3c14..0e69b5b 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -1494,8 +1494,7 @@ int assoc_array_gc(struct assoc_array *array,
                shortcut = assoc_array_ptr_to_shortcut(cursor);
                keylen = round_up(shortcut->skip_to_level, 
ASSOC_ARRAY_KEY_CHUNK_SIZE);
                keylen >>= ASSOC_ARRAY_KEY_CHUNK_SHIFT;
-               new_s = kmalloc(sizeof(struct assoc_array_shortcut) +
-                               keylen * sizeof(unsigned long), GFP_KERNEL);
+               new_s = kmalloc(struct_size(new_s, index_key, keylen), 
GFP_KERNEL);
                if (!new_s)
                        goto enomem;
                pr_devel("dup shortcut %p -> %p\n", shortcut, new_s);
-- 
2.7.4