From 7935121ed732210647261e79d21bd3cbcd7229e9 Mon Sep 17 00:00:00 2001
From: Alexey Korolev <akorolev@infradead.org>
Date: Mon, 14 Apr 2008 20:45:06 +0100
Subject: [PATCH] --- yaml --- r: 88330 b: refs/heads/master c:
 abe2f41430770270a1512bf78f489284bfbdbd04 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f132915b107d..0429ae15b3b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19e729a928172103e101ffd0829fd13e68c13f78
+refs/heads/master: abe2f41430770270a1512bf78f489284bfbdbd04
diff --git a/trunk/fs/jffs2/file.c b/trunk/fs/jffs2/file.c
index f9c5dd6f4b64..dcc2734e0b5d 100644
--- a/trunk/fs/jffs2/file.c
+++ b/trunk/fs/jffs2/file.c
@@ -129,7 +129,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
 	struct inode *inode = mapping->host;
 	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
 	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-	uint32_t pageofs = pos & (PAGE_CACHE_SIZE - 1);
+	uint32_t pageofs = index << PAGE_CACHE_SHIFT;
 	int ret = 0;
 
 	pg = __grab_cache_page(mapping, index);