Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12e8fd6f authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

lib/rhashtable.c: use kvzalloc() in bucket_table_alloc() when possible 

bucket_table_alloc() can be currently called with GFP_KERNEL or
GFP_ATOMIC.  For the former we basically have an open coded kvzalloc()
while the later only uses kzalloc().  Let's simplify the code a bit by
the dropping the open coded path and replace it with kvzalloc().

Link: http://lkml.kernel.org/r/20170531155145.17111-3-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Thomas Graf <tgraf@suug.ch>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c46ecce4

lib/rhashtable.c

+3 −4
Original line number Diff line number Diff line
@@ -211,11 +211,10 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht, 
	int i;



	size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]);

	if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) ||

	    gfp != GFP_KERNEL)

	if (gfp != GFP_KERNEL)

		tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY);

	if (tbl == NULL && gfp == GFP_KERNEL)

		tbl = vzalloc(size);

	else

		tbl = kvzalloc(size, gfp);



	size = nbuckets;