From 1b06b1964d2c07a055b82de1f070842e81c5babe Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Mon, 19 Mar 2012 15:25:50 -0400
Subject: [PATCH] --- yaml --- r: 292399 b: refs/heads/master c:
 220cca2a4f5867db595135e0450381032eb54902 h: refs/heads/master i:   292397:
 1bf89c5f203999390074da5ae943257a9373afca   292395:
 b256b4fe7e362bfd16b4d491d330d66c17a85241   292391:
 3510a84aabc9fffe71ec9799bcb509c2958c715b   292383:
 ccd29c70f5d07b1dd66c836a1ed91ae6a94d39a5 v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/bmap.c  | 4 ++--
 trunk/fs/gfs2/quota.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e151faa67447..033c4d0306e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58a7d5fb8e31279b992db4027e44b053a84b7344
+refs/heads/master: 220cca2a4f5867db595135e0450381032eb54902
diff --git a/trunk/fs/gfs2/bmap.c b/trunk/fs/gfs2/bmap.c
index 14a704015970..197c5c47e577 100644
--- a/trunk/fs/gfs2/bmap.c
+++ b/trunk/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/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
index a45b21b03915..4856c66640bf 100644
--- a/trunk/fs/gfs2/quota.c
+++ b/trunk/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;