Commit e1e01411 authored by Hubert Jasudowicz's avatar Hubert Jasudowicz Committed by Linus Torvalds
Browse files

groups: simplify struct group_info allocation 

Combine kmalloc and vmalloc into a single call.  Use struct_size macro
instead of direct size calculation.

Link: https://lkml.kernel.org/r/ba9ba5beea9a44b7196c41a0d9528abd5f20dd2e.1611620846.git.hubert.jasudowicz@gmail.com


Signed-off-by: default avatarHubert Jasudowicz <hubert.jasudowicz@gmail.com>
Cc: Gao Xiang <xiang@kernel.org>
Cc: Micah Morton <mortonm@chromium.org>
Cc: Michael Kelley <mikelley@microsoft.com>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Thomas Cedeno <thomascedeno@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1f26493

kernel/groups.c

+1 −6
Original line number Diff line number Diff line
@@ -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;