1 files changed, 2 insertions, 4 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b9755ce98218..3cfbd6261f9b 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4624,9 +4624,7 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start,
 {
         struct extent_buffer *eb = NULL;
 
-        eb = kmem_cache_zalloc(extent_buffer_cache, GFP_NOFS);
-        if (eb == NULL)
-                return NULL;
+        eb = kmem_cache_zalloc(extent_buffer_cache, GFP_NOFS|__GFP_NOFAIL);
         eb->start = start;
         eb->len = len;
         eb->fs_info = fs_info;
@@ -4884,7 +4882,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
                 return NULL;
 
         for (i = 0; i < num_pages; i++, index++) {
-                p = find_or_create_page(mapping, index, GFP_NOFS);
+                p = find_or_create_page(mapping, index, GFP_NOFS|__GFP_NOFAIL);
                 if (!p)
                         goto free_eb;