[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20180604114622.GK19202@dhcp22.suse.cz>
Date: Mon, 4 Jun 2018 13:46:22 +0200
From: Michal Hocko <mhocko@...nel.org>
To: Davidlohr Bueso <dave@...olabs.net>
Cc: akpm@...ux-foundation.org, torvalds@...ux-foundation.org,
tgraf@...g.ch, herbert@...dor.apana.org.au,
manfred@...orfullife.com, guillaume.knispel@...ersonicimagine.com,
linux-api@...r.kernel.org, linux-kernel@...r.kernel.org,
Davidlohr Bueso <dbueso@...e.de>
Subject: Re: [PATCH 2/5] lib/rhashtable: guarantee initial hashtable
allocation
On Fri 01-06-18 09:01:22, Davidlohr Bueso wrote:
[...]
> diff --git a/lib/rhashtable.c b/lib/rhashtable.c
> index 05a4b1b8b8ce..ae17da6f0c75 100644
> --- a/lib/rhashtable.c
> +++ b/lib/rhashtable.c
> @@ -175,7 +175,7 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
> int i;
>
> size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]);
> - if (gfp != GFP_KERNEL)
> + if ((gfp & ~__GFP_NOFAIL) != GFP_KERNEL)
> tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY);
> else
> tbl = kvzalloc(size, gfp);
Just a heads up. This is not longer needed after
http://lkml.kernel.org/r/20180601115329.27807-1-mhocko@kernel.org
is applied. Moreover it will conflict at that spot.
--
Michal Hocko
SUSE Labs
Powered by blists - more mailing lists