diff mbox series

[12/14] backport: update lib-rhashtable.c

Message ID 20180920112842.27198-13-luca@coelho.fi (mailing list archive)
State Rejected
Headers show
Series backport: updates for 4.19 | expand

Commit Message

Luca Coelho Sept. 20, 2018, 11:28 a.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

The bucket_table_alloc() function was reworked, so update the patch
accordingly.  It's much simpler now, if !GFP_KERNEL, we just fail
(like we used to).  This is not a problem because we only use this
function with GFP_KERNEL anyway.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 patches/lib-rhashtable.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 patches/lib-rhashtable.patch

Comments

Luca Coelho Sept. 20, 2018, 4:23 p.m. UTC | #1 
On Thu, 2018-09-20 at 14:28 +0300, Luca Coelho wrote:
> From: Luca Coelho <luciano.coelho@intel.com>
> 
> The bucket_table_alloc() function was reworked, so update the patch
> accordingly.  It's much simpler now, if !GFP_KERNEL, we just fail
> (like we used to).  This is not a problem because we only use this
> function with GFP_KERNEL anyway.
> 
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> ---

As Johannes pointed out, this patch is not needed, so please ignore
it. 

The reason I kept it is because I mistakenly didn't add the kvzalloc()
backport to one of our internal tree generations and had to keep the
this patch after I rebased on top of Felix's patch that removed this
entirely.

--
Cheers,
Luca.

--
To unsubscribe from this list: send the line "unsubscribe backports" in
diff mbox series

Patch

diff --git a/patches/lib-rhashtable.patch b/patches/lib-rhashtable.patch
new file mode 100644
index 000000000000..a538d0c83fc7
--- /dev/null
+++ b/patches/lib-rhashtable.patch
@@ -0,0 +1,14 @@ 
+diff --git a/compat/lib-rhashtable.c b/compat/lib-rhashtable.c
+index 30526afa8343..bee37f2682dd 100644
+--- a/compat/lib-rhashtable.c
++++ b/compat/lib-rhashtable.c
+@@ -173,7 +173,8 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
+ 	int i;
+ 
+ 	size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]);
+-	tbl = kvzalloc(size, gfp);
++	if (gfp == GFP_KERNEL)
++		tbl = vzalloc(size);
+ 
+ 	size = nbuckets;
+