1 files changed, 2 insertions, 2 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 0d4e57431de4..c6100628a6ef 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3281,7 +3281,7 @@ retry:
                                         flags | GFP_THISNODE, nid);
         }
 
-        if (!obj) {
+        if (!obj && !(flags & __GFP_NO_GROW)) {
                 /*
                  * This allocation will be performed within the constraints
                  * of the current cpuset / memory policy requirements.
@@ -3310,7 +3310,7 @@ retry:
                                          */
                                         goto retry;
                         } else {
-                                kmem_freepages(cache, obj);
+                                /* cache_grow already freed obj */
                                 obj = NULL;
                         }
                 }