This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / truncate.c

diff --git a/mm/truncate.c b/mm/truncate.c
index dc2e9a5..63dad42 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -79,12 +79,6 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
                spin_unlock_irq(&mapping->tree_lock);
                return 0;
        }
-
-       BUG_ON(PagePrivate(page));
-       if (page_count(page) != 2) {
-               spin_unlock_irq(&mapping->tree_lock);
-               return 0;
-       }
        __remove_from_page_cache(page);
        spin_unlock_irq(&mapping->tree_lock);
        ClearPageUptodate(page);
@@ -277,11 +271,7 @@ void invalidate_inode_pages2(struct address_space *mapping)
                                        clear_page_dirty(page);
                                        ClearPageUptodate(page);
                                } else {
-                                       if (!invalidate_complete_page(mapping,
-                                                                     page)) {
-                                               clear_page_dirty(page);
-                                               ClearPageUptodate(page);
-                                       }
+                                       invalidate_complete_page(mapping, page);
                                }
                        }
                        unlock_page(page);