Commit 12e8fd6f authored Jul 10, 2017 by Michal Hocko Committed by Linus Torvalds Jul 10, 2017

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: Michal Hocko <mhocko@suse.com>
Cc: Thomas Graf <tgraf@suug.ch>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c46ecce4

lib/rhashtable.c

+3 −4

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

	size = sizeof(tbl) + nbuckets sizeof(tbl->buckets[0]);		size = sizeof(tbl) + nbuckets sizeof(tbl->buckets[0]);
	if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) \|\|		if (gfp != GFP_KERNEL)
	gfp != GFP_KERNEL)
	tbl = kzalloc(size, gfp \| __GFP_NOWARN \| __GFP_NORETRY);		tbl = kzalloc(size, gfp \| __GFP_NOWARN \| __GFP_NORETRY);
	if (tbl == NULL && gfp == GFP_KERNEL)		else
	tbl = vzalloc(size);		tbl = kvzalloc(size, gfp);

	size = nbuckets;		size = nbuckets;

Admin message