From 1526d45e0e425adf3573b93b2659459291695c57 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Fri, 20 Jul 2007 00:31:45 -0700
Subject: [PATCH] --- yaml --- r: 61983 b: refs/heads/master c:
 1833633803c7ef4d8f09877d3f1549cbd252f477 h: refs/heads/master i:   61981:
 7415659585b10b149804979668cff3aa7745287d   61979:
 90e50f304fde19d60d2a38fe028915833b911e60   61975:
 2f40a5fc7f15506c0b24f2358ee1133fb58889b9   61967:
 1dd89eb7c152f9a40e19e47d06889401101ce372   61951:
 b28b183d31ad35134993139f147a926cd3d775fb v: v3

---
 [refs]                   | 2 +-
 trunk/fs/buffer.c        | 2 +-
 trunk/fs/ecryptfs/mmap.c | 5 ++---
 trunk/fs/ocfs2/mmap.c    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8d900c9ff172..0be326a6180e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e228929bc257b963523ed75aa60d2ad77ece2189
+refs/heads/master: 1833633803c7ef4d8f09877d3f1549cbd252f477
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 02ebb1f1d3b0..0e5ec371ce72 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2221,7 +2221,7 @@ block_page_mkwrite(struct vm_area_struct *vma, struct page *page,
 	lock_page(page);
 	size = i_size_read(inode);
 	if ((page->mapping != inode->i_mapping) ||
-	    ((page->index << PAGE_CACHE_SHIFT) > size)) {
+	    (page_offset(page) > size)) {
 		/* page got truncated out from underneath us */
 		goto out_unlock;
 	}
diff --git a/trunk/fs/ecryptfs/mmap.c b/trunk/fs/ecryptfs/mmap.c
index 7d5a43cb0d5c..e4ab7bc14efe 100644
--- a/trunk/fs/ecryptfs/mmap.c
+++ b/trunk/fs/ecryptfs/mmap.c
@@ -409,8 +409,7 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,
 	if (!PageUptodate(page))
 		rc = ecryptfs_do_readpage(file, page, page->index);
 	if (page->index != 0) {
-		loff_t end_of_prev_pg_pos =
-			(((loff_t)page->index << PAGE_CACHE_SHIFT) - 1);
+		loff_t end_of_prev_pg_pos = page_offset(page) - 1;
 
 		if (end_of_prev_pg_pos > i_size_read(page->mapping->host)) {
 			rc = ecryptfs_truncate(file->f_path.dentry,
@@ -736,7 +735,7 @@ static int ecryptfs_commit_write(struct file *file, struct page *page,
 		goto out;
 	}
 	inode->i_blocks = lower_inode->i_blocks;
-	pos = (page->index << PAGE_CACHE_SHIFT) + to;
+	pos = page_offset(page) + to;
 	if (pos > i_size_read(inode)) {
 		i_size_write(inode, pos);
 		ecryptfs_printk(KERN_DEBUG, "Expanded file size to "
diff --git a/trunk/fs/ocfs2/mmap.c b/trunk/fs/ocfs2/mmap.c
index ee64749e2eeb..98756156d298 100644
--- a/trunk/fs/ocfs2/mmap.c
+++ b/trunk/fs/ocfs2/mmap.c
@@ -89,7 +89,7 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh,
 {
 	int ret;
 	struct address_space *mapping = inode->i_mapping;
-	loff_t pos = page->index << PAGE_CACHE_SHIFT;
+	loff_t pos = page_offset(page);
 	unsigned int len = PAGE_CACHE_SIZE;
 	pgoff_t last_index;
 	struct page *locked_page = NULL;