diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2012-03-19 15:25:50 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-03-20 11:05:00 +0000 |
| commit | 220cca2a4f5867db595135e0450381032eb54902 (patch) | |
| tree | c8b0f7dd3e5a49a3cc18c981f3e6087849be98c4 /fs | |
| parent | 58a7d5fb8e31279b992db4027e44b053a84b7344 (diff) | |
| download | linux-220cca2a4f5867db595135e0450381032eb54902.tar.gz linux-220cca2a4f5867db595135e0450381032eb54902.tar.bz2 linux-220cca2a4f5867db595135e0450381032eb54902.zip | |
GFS2: Change truncate page allocation to be GFP_NOFS
This patch changes the page allocation in gfs2_block_truncate_page
and two others to GFP_NOFS to avoid deadlock in low-memory conditions.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/bmap.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/quota.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 14a704015970..197c5c47e577 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -60,7 +60,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, int release = 0; if (!page || page->index) { - page = grab_cache_page(inode->i_mapping, 0); + page = find_or_create_page(inode->i_mapping, 0, GFP_NOFS); if (!page) return -ENOMEM; release = 1; @@ -930,7 +930,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) struct page *page; int err; - page = grab_cache_page(mapping, index); + page = find_or_create_page(mapping, index, GFP_NOFS); if (!page) return 0; diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index a45b21b03915..4856c66640bf 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -681,7 +681,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, ptr = qp; nbytes = sizeof(struct gfs2_quota); get_a_page: - page = grab_cache_page(mapping, index); + page = find_or_create_page(mapping, index, GFP_NOFS); if (!page) return -ENOMEM; |