Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index f9c5dd6f4b64..dcc2734e0b5d 100644
--- a/fs/jffs2/file.c
+++ b/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);