1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 497ec33ff22d..623d5c8bb1e1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2765,10 +2765,10 @@ done:
        *ptr = memcg;
        return 0;
 nomem:
-        *ptr = NULL;
+        if (!(gfp_mask & __GFP_NOFAIL)) {
-        if (gfp_mask & __GFP_NOFAIL)
+                *ptr = NULL;
-                return 0;
+                return -ENOMEM;
-        return -ENOMEM;
+        }
 bypass:
        *ptr = root_mem_cgroup;
        return -EINTR;

diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 497ec33ff22d..623d5c8bb1e1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c
@@ -2765,10 +2765,10 @@ done:
2765	*ptr = memcg;	2765	*ptr = memcg;
2766	return 0;	2766	return 0;
2767	nomem:	2767	nomem:
2768	*ptr = NULL;	2768	if (!(gfp_mask & __GFP_NOFAIL)) {
2769	if (gfp_mask & __GFP_NOFAIL)	2769	*ptr = NULL;
2770	return 0;	2770	return -ENOMEM;
2771	return -ENOMEM;	2771	}
2772	bypass:	2772	bypass:
2773	*ptr = root_mem_cgroup;	2773	*ptr = root_mem_cgroup;
2774	return -EINTR;	2774	return -EINTR;