From: David Howells <dhowells@redhat.com>

Cause read_cache_pages() to release page-private data on a page for which
add_to_page_cache() fails or the filler function fails.  This permits pages
with caching references associated with them to be cleaned up.

The invalidatepage() address space op is called (indirectly) to do the honours.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/readahead.c |   24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff -puN mm/readahead.c~fs-cache-release-page-private-after-failed-readahead-12 mm/readahead.c
--- a/mm/readahead.c~fs-cache-release-page-private-after-failed-readahead-12
+++ a/mm/readahead.c
@@ -125,20 +125,35 @@ static inline unsigned long get_next_ra_
  *   such as the NFS fs marking pages that are cached locally on disk, thus we
  *   need to give the fs a chance to clean up in the event of an error
  */
-static void read_cache_pages_release_page(struct address_space *mapping,
-					  struct page *page)
+static void read_cache_pages_invalidate_page(struct address_space *mapping,
+					     struct page *page)
 {
 	if (PagePrivate(page)) {
 		if (TestSetPageLocked(page))
 			BUG();
 		page->mapping = mapping;
-		try_to_release_page(page, GFP_KERNEL);
+		do_invalidatepage(page, 0);
 		page->mapping = NULL;
 		unlock_page(page);
 	}
 	page_cache_release(page);
 }
 
+/*
+ * release a list of pages, invalidating them first if need be
+ */
+static void read_cache_pages_invalidate_pages(struct address_space *mapping,
+					      struct list_head *pages)
+{
+	struct page *victim;
+
+	while (!list_empty(pages)) {
+		victim = list_to_page(pages);
+		list_del(&victim->lru);
+		read_cache_pages_invalidate_page(mapping, victim);
+	}
+}
+
 /**
  * read_cache_pages - populate an address space with some pages & start reads against them
  * @mapping: the address_space
@@ -162,14 +177,13 @@ int read_cache_pages(struct address_spac
 		page = list_to_page(pages);
 		list_del(&page->lru);
 		if (add_to_page_cache(page, mapping, page->index, GFP_KERNEL)) {
-			read_cache_pages_release_page(mapping, page);
 			continue;
 		}
 		ret = filler(data, page);
 		if (!pagevec_add(&lru_pvec, page))
 			__pagevec_lru_add(&lru_pvec);
 		if (ret) {
-			put_pages_list(pages);
+			read_cache_pages_invalidate_pages(mapping, pages);
 			break;
 		}
 	}
_