fs: buffer: move allocation failure loop into the allocator

[deliverable/linux.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 65fc6a4498411332478c92d7ccf473a1cd341e53..34d3ca9572d6baed85499d099a0050af3b9bdf66 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2766,6 +2766,8 @@ done:
        return 0;
 nomem:
        *ptr = NULL;
+       if (gfp_mask & __GFP_NOFAIL)
+               return 0;
        return -ENOMEM;
 bypass:
        *ptr = root_mem_cgroup;