Messages in this thread Patch in this message | | | From | Hubert Jasudowicz <> | Subject | [PATCH 2/2] groups: Simplify struct group_info allocation | Date | Tue, 26 Jan 2021 02:37:16 +0100 |
| |
Combine kmalloc and vmalloc into a single call. Use struct_size macro instead of direct size calculation.
Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@gmail.com> --- kernel/groups.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/kernel/groups.c b/kernel/groups.c index fe7e6385530e..787b381c7c00 100644 --- a/kernel/groups.c +++ b/kernel/groups.c @@ -15,12 +15,7 @@ struct group_info *groups_alloc(int gidsetsize) { struct group_info *gi; - unsigned int len; - - len = sizeof(struct group_info) + sizeof(kgid_t) * gidsetsize; - gi = kmalloc(len, GFP_KERNEL_ACCOUNT|__GFP_NOWARN|__GFP_NORETRY); - if (!gi) - gi = __vmalloc(len, GFP_KERNEL_ACCOUNT); + gi = kvmalloc(struct_size(gi, gid, gidsetsize), GFP_KERNEL_ACCOUNT); if (!gi) return NULL; -- 2.30.0
| |