From 9aea2260537cd3ecbd474b85cdc815d9ee89d753 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Tue, 6 Jan 2009 10:47:50 -0600
Subject: [PATCH] --- yaml --- r: 126932 b: refs/heads/master c:
 c8f554b947e80a90e1b43bbd4fd26c27765b5f96 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6b6ed1978530..e8cafc95b0a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0027ce681e3cd49fa34dab023574611f4384291d
+refs/heads/master: c8f554b947e80a90e1b43bbd4fd26c27765b5f96
diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c
index 289c5f54ba53..93fe41b67f97 100644
--- a/trunk/fs/gfs2/ops_file.c
+++ b/trunk/fs/gfs2/ops_file.c
@@ -342,7 +342,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page)
 	struct gfs2_inode *ip = GFS2_I(inode);
 	struct gfs2_sbd *sdp = GFS2_SB(inode);
 	unsigned long last_index;
-	u64 pos = page->index << (PAGE_CACHE_SIZE - inode->i_blkbits);
+	u64 pos = page->index << PAGE_CACHE_SHIFT;
 	unsigned int data_blocks, ind_blocks, rblocks;
 	int alloc_required = 0;
 	struct gfs2_holder gh;