Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/mm/filemap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN mm/filemap.c~re-fix-pagecache-reading-off-by-one-cleanup mm/filemap.c
--- 25/mm/filemap.c~re-fix-pagecache-reading-off-by-one-cleanup	Tue Aug 24 15:41:54 2004
+++ 25-akpm/mm/filemap.c	Tue Aug 24 15:44:19 2004
@@ -831,8 +831,8 @@ readpage:
 		 * another truncate extends the file - this is desired though).
 		 */
 		isize = i_size_read(inode);
-		if ( !isize || index >
-			(end_index = (isize - 1) >> PAGE_CACHE_SHIFT) ) {
+		end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
+		if (unlikely(!isize || index > end_index)) {
 			page_cache_release(page);
 			goto out;
 		}
_