From 64d2552eb82667ba4bdc93e6417a96b5ceb16a51 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 30 Jan 2006 11:55:32 +0000
Subject: [PATCH] --- yaml --- r: 38601 b: refs/heads/master c:
 9b124fbb8ddb3d0b17f5a807414d85cbaf527a56 h: refs/heads/master i:   38599:
 fe8bd86c91f23d80de29d2dc7450d07425b59ec5 v: v3

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

diff --git a/[refs] b/[refs]
index 627978d4b7d1..5c188713804f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2442a098be6b38ee3abe8edda3224b48ff4d604a
+refs/heads/master: 9b124fbb8ddb3d0b17f5a807414d85cbaf527a56
diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c
index a7fbfa0bbaf8..da5a0b445188 100644
--- a/trunk/fs/gfs2/ops_address.c
+++ b/trunk/fs/gfs2/ops_address.c
@@ -13,6 +13,7 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/pagemap.h>
+#include <linux/mpage.h>
 #include <asm/semaphore.h>
 
 #include "gfs2.h"
@@ -286,7 +287,7 @@ static int gfs2_readpage(struct file *file, struct page *page)
 			} else
 				error = zero_readpage(page);
 		} else
-			error = block_read_full_page(page, gfs2_get_block);
+			error = mpage_readpage(page, gfs2_get_block);
 	} else
 		error = jdata_readpage(ip, page);