1 files changed, 7 insertions, 3 deletions

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 14a70401597..03c04febe26 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;
@@ -724,7 +724,11 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
         int metadata;
         unsigned int revokes = 0;
         int x;
-        int error = 0;
+        int error;
+
+        error = gfs2_rindex_update(sdp);
+        if (error)
+                return error;
 
         if (!*top)
                 sm->sm_first = 0;
@@ -930,7 +934,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;