author: Eric W. Biederman <ebiederm@xmission.com> 2014-02-10 14:25:41 -0800
committer: Linus Torvalds <torvalds@linux-foundation.org> 2014-02-10 16:01:41 -0800
commit: 96c7a2ff21501691587e1ae969b83cbec8b78e08
parent: a9c8e4beeeb64c22b84c803747487857fe424b68
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/fs/file.c b/fs/file.c
index 771578b33fb6..db25c2bdfe46 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -34,7 +34,7 @@ static void *alloc_fdmem(size_t size)
* vmalloc() if the allocation size will be considered "large" by the VM.
*/
if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) {
- void *data = kmalloc(size, GFP_KERNEL|__GFP_NOWARN);
+ void *data = kmalloc(size, GFP_KERNEL|__GFP_NOWARN|__GFP_NORETRY);
if (data != NULL)
return data;
}