Merge branch 'akpm'

[karo-tx-linux.git] / mm / truncate.c

diff --git a/mm/truncate.c b/mm/truncate.c
index 632b15e29f74533a5a22434351d8d21dc07e4a54..b4d575c9a0ee475299517ea317493c8b328d13a7 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -52,7 +52,7 @@ void do_invalidatepage(struct page *page, unsigned long offset)
 static inline void truncate_partial_page(struct page *page, unsigned partial)
 {
        zero_user_segment(page, partial, PAGE_CACHE_SIZE);
-       cleancache_flush_page(page->mapping, page);
+       cleancache_invalidate_page(page->mapping, page);
        if (page_has_private(page))
                do_invalidatepage(page, partial);
 }
@@ -213,7 +213,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
        pgoff_t end;
        int i;
 
-       cleancache_flush_inode(mapping);
+       cleancache_invalidate_inode(mapping);
        if (mapping->nrpages == 0)
                return;
 
@@ -292,7 +292,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
                mem_cgroup_uncharge_end();
                index++;
        }
-       cleancache_flush_inode(mapping);
+       cleancache_invalidate_inode(mapping);
 }
 EXPORT_SYMBOL(truncate_inode_pages_range);
 
@@ -444,7 +444,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
        int ret2 = 0;
        int did_range_unmap = 0;
 
-       cleancache_flush_inode(mapping);
+       cleancache_invalidate_inode(mapping);
        pagevec_init(&pvec, 0);
        index = start;
        while (index <= end && pagevec_lookup(&pvec, mapping, index,
@@ -500,7 +500,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
                cond_resched();
                index++;
        }
-       cleancache_flush_inode(mapping);
+       cleancache_invalidate_inode(mapping);
        return ret;
 }
 EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range);