From 105b5ca82f80856f7c4f7bc344b7056fc84c64df Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@oracle.com>
Date: Sun, 25 Jun 2006 05:46:46 -0700
Subject: [PATCH] --- yaml --- r: 29629 b: refs/heads/master c:
 9f1a3cfcffaed2fbb3206179295c79ca8289f5c3 h: refs/heads/master i:   29627:
 1b146fd4b1bf124465094107f3eb2aef715cb98c v: v3

---
 [refs]               |  2 +-
 trunk/mm/readahead.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0fe454826dfa..a313ea8c3f4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09a9a45dc62fef5f46a0dc98a3cefdb464cc4aaa
+refs/heads/master: 9f1a3cfcffaed2fbb3206179295c79ca8289f5c3
diff --git a/trunk/mm/readahead.c b/trunk/mm/readahead.c
index 0f142a40984b..4ee52cadab93 100644
--- a/trunk/mm/readahead.c
+++ b/trunk/mm/readahead.c
@@ -182,14 +182,11 @@ static int read_pages(struct address_space *mapping, struct file *filp,
 		list_del(&page->lru);
 		if (!add_to_page_cache(page, mapping,
 					page->index, GFP_KERNEL)) {
-			ret = mapping->a_ops->readpage(filp, page);
-			if (ret != AOP_TRUNCATED_PAGE) {
-				if (!pagevec_add(&lru_pvec, page))
-					__pagevec_lru_add(&lru_pvec);
-				continue;
-			} /* else fall through to release */
-		}
-		page_cache_release(page);
+			mapping->a_ops->readpage(filp, page);
+			if (!pagevec_add(&lru_pvec, page))
+				__pagevec_lru_add(&lru_pvec);
+		} else
+			page_cache_release(page);
 	}
 	pagevec_lru_add(&lru_pvec);
 	ret = 0;