aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-07-11 10:47:06 -0400
committerChris Mason <chris.mason@oracle.com>2011-07-27 12:46:43 -0400
commita94733d0bc630edaedc6ca156752dd5a7cb82521 (patch)
tree3f0bd508aa1ce5894e43df45bb73031a380ed8f5 /fs/btrfs/ioctl.c
parentbab39bf998133510f2dad08158006197ec0dabea (diff)
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: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a3c4751e07db..09c9a8d26ee9 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -867,8 +867,8 @@ again:
867 /* step one, lock all the pages */ 867 /* step one, lock all the pages */
868 for (i = 0; i < num_pages; i++) { 868 for (i = 0; i < num_pages; i++) {
869 struct page *page; 869 struct page *page;
870 page = grab_cache_page(inode->i_mapping, 870 page = find_or_create_page(inode->i_mapping,
871 start_index + i); 871 start_index + i, GFP_NOFS);
872 if (!page) 872 if (!page)
873 break; 873 break;
874 874