Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / mm / readahead.c

diff --git a/mm/readahead.c b/mm/readahead.c
index 6be927569cf68b97c3cc4e1185f32c1d950d4cdb..133b6d525513a886247ce3adc5eff41ef4e91752 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -33,14 +33,15 @@ EXPORT_SYMBOL_GPL(file_ra_state_init);
 
 /*
  * see if a page needs releasing upon read_cache_pages() failure
- * - the caller of read_cache_pages() may have set PG_private before calling,
- *   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
+ * - the caller of read_cache_pages() may have set PG_private or PG_fscache
+ *   before calling, 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_invalidate_page(struct address_space *mapping,
                                             struct page *page)
 {
-       if (PagePrivate(page)) {
+       if (page_has_private(page)) {
                if (!trylock_page(page))
                        BUG();
                page->mapping = mapping;