From 1b5dc550888b9d557fbda2dd16e902ae34afa5b9 Mon Sep 17 00:00:00 2001
From: Nate Diller <nate.diller@gmail.com>
Date: Thu, 10 May 2007 22:56:01 -0700
Subject: [PATCH] --- yaml --- r: 56998 b: refs/heads/master c:
 5c3c6bb7709bf2bf4132750124879b3d89183e46 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ocfs2/aops.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 609420629297..96770bfc89e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1024c902abdcbd2425aa850d7ef04e013ffb35f0
+refs/heads/master: 5c3c6bb7709bf2bf4132750124879b3d89183e46
diff --git a/trunk/fs/ocfs2/aops.c b/trunk/fs/ocfs2/aops.c
index 30306707b2ca..0023b31e48a8 100644
--- a/trunk/fs/ocfs2/aops.c
+++ b/trunk/fs/ocfs2/aops.c
@@ -238,10 +238,7 @@ static int ocfs2_readpage(struct file *file, struct page *page)
 	 * XXX sys_readahead() seems to get that wrong?
 	 */
 	if (start >= i_size_read(inode)) {
-		char *addr = kmap(page);
-		memset(addr, 0, PAGE_SIZE);
-		flush_dcache_page(page);
-		kunmap(page);
+		zero_user_page(page, 0, PAGE_SIZE, KM_USER0);
 		SetPageUptodate(page);
 		ret = 0;
 		goto out_alloc;