Commit a94733d0 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason

Btrfs: use find_or_create_page instead of grab_cache_page

grab_cache_page will use mapping_gfp_mask(), which for all inodes is set to
GFP_HIGHUSER_MOVABLE.  So instead use find_or_create_page in all cases where we
need GFP_NOFS so we don't deadlock.  Thanks,
Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent bab39bf9
...@@ -1081,7 +1081,8 @@ static noinline int prepare_pages(struct btrfs_root *root, struct file *file, ...@@ -1081,7 +1081,8 @@ static noinline int prepare_pages(struct btrfs_root *root, struct file *file,
again: again:
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
pages[i] = grab_cache_page(inode->i_mapping, index + i); pages[i] = find_or_create_page(inode->i_mapping, index + i,
GFP_NOFS);
if (!pages[i]) { if (!pages[i]) {
faili = i - 1; faili = i - 1;
err = -ENOMEM; err = -ENOMEM;
......
...@@ -307,7 +307,7 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, ...@@ -307,7 +307,7 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
if (!num_entries && !num_bitmaps) if (!num_entries && !num_bitmaps)
break; break;
page = grab_cache_page(inode->i_mapping, index); page = find_or_create_page(inode->i_mapping, index, GFP_NOFS);
if (!page) if (!page)
goto free_cache; goto free_cache;
...@@ -594,7 +594,7 @@ int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode, ...@@ -594,7 +594,7 @@ int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
* know and don't freak out. * know and don't freak out.
*/ */
while (index < num_pages) { while (index < num_pages) {
page = grab_cache_page(inode->i_mapping, index); page = find_or_create_page(inode->i_mapping, index, GFP_NOFS);
if (!page) { if (!page) {
int i; int i;
......
...@@ -3398,7 +3398,7 @@ static int btrfs_truncate_page(struct address_space *mapping, loff_t from) ...@@ -3398,7 +3398,7 @@ static int btrfs_truncate_page(struct address_space *mapping, loff_t from)
ret = -ENOMEM; ret = -ENOMEM;
again: again:
page = grab_cache_page(mapping, index); page = find_or_create_page(mapping, index, GFP_NOFS);
if (!page) { if (!page) {
btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE); btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
goto out; goto out;
......
...@@ -867,8 +867,8 @@ static int cluster_pages_for_defrag(struct inode *inode, ...@@ -867,8 +867,8 @@ static int cluster_pages_for_defrag(struct inode *inode,
/* step one, lock all the pages */ /* step one, lock all the pages */
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
struct page *page; struct page *page;
page = grab_cache_page(inode->i_mapping, page = find_or_create_page(inode->i_mapping,
start_index + i); start_index + i, GFP_NOFS);
if (!page) if (!page)
break; break;
......
...@@ -2955,7 +2955,8 @@ static int relocate_file_extent_cluster(struct inode *inode, ...@@ -2955,7 +2955,8 @@ static int relocate_file_extent_cluster(struct inode *inode,
page_cache_sync_readahead(inode->i_mapping, page_cache_sync_readahead(inode->i_mapping,
ra, NULL, index, ra, NULL, index,
last_index + 1 - 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) { if (!page) {
btrfs_delalloc_release_metadata(inode, btrfs_delalloc_release_metadata(inode,
PAGE_CACHE_SIZE); PAGE_CACHE_SIZE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment