compat: avoid usage of kvzalloc() in rhashtable.c

This reverts commit 12e8fd6fd3802 ("lib/rhashtable.c: use kvzalloc() in
bucket_table_alloc() when possible") from upstream kernel.
Kernel versions older that 4.12 do not have kvzalloc() try to avoid the
usage of this.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/patches/lib-rhashtable.patch b/patches/lib-rhashtable.patch
index 9c262b02831cc68e311f2815836dda99afa657e3..35424efbdb54c32562f2205d425e05cb6bad7162 100644 (file)
--- a/patches/lib-rhashtable.patch
+++ b/patches/lib-rhashtable.patch
@@ -27,6 +27,19 @@
                if (!tbl->locks)
                        return -ENOMEM;
                for (i = 0; i < size; i++)
--- 
-1.9.1
+@@ -226,10 +226,11 @@ 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 (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) ||
++          gfp != GFP_KERNEL)
+               tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY);
+-      else
+-              tbl = kvzalloc(size, gfp);
++      if (tbl == NULL && gfp == GFP_KERNEL)
++              tbl = vzalloc(size);
+ 
+       size = nbuckets;
+