Merge branch 'integration' into for-linus

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 5e0a3dc79a45..59bb1764273d 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2955,7 +2955,8 @@ static int relocate_file_extent_cluster(struct inode *inode,
                         page_cache_sync_readahead(inode->i_mapping,
                                                   ra, NULL, index,
                                                   last_index + 1 - index);
-                        page = grab_cache_page(inode->i_mapping, index);
+                        page = find_or_create_page(inode->i_mapping, index,
+                                                   GFP_NOFS);
                         if (!page) {
                                 btrfs_delalloc_release_metadata(inode,
                                                         PAGE_CACHE_SIZE);