linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/mm/truncate.c b/mm/truncate.c
index 6772c41..6cb3fff 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -68,10 +68,10 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
                return 0;
 
        write_lock_irq(&mapping->tree_lock);
-       if (PageDirty(page))
-               goto failed;
-       if (page_count(page) != 2)      /* caller's ref + pagecache ref */
-               goto failed;
+       if (PageDirty(page)) {
+               write_unlock_irq(&mapping->tree_lock);
+               return 0;
+       }
 
        BUG_ON(PagePrivate(page));
        __remove_from_page_cache(page);
@@ -79,9 +79,6 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
        ClearPageUptodate(page);
        page_cache_release(page);       /* pagecache ref */
        return 1;
-failed:
-       write_unlock_irq(&mapping->tree_lock);
-       return 0;
 }
 
 /**
@@ -233,24 +230,14 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
                        pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
                for (i = 0; i < pagevec_count(&pvec); i++) {
                        struct page *page = pvec.pages[i];
-                       pgoff_t index;
-                       int lock_failed;
-
-                       lock_failed = TestSetPageLocked(page);
 
-                       /*
-                        * We really shouldn't be looking at the ->index of an
-                        * unlocked page.  But we're not allowed to lock these
-                        * pages.  So we rely upon nobody altering the ->index
-                        * of this (pinned-by-us) page.
-                        */
-                       index = page->index;
-                       if (index > next)
-                               next = index;
-                       next++;
-                       if (lock_failed)
+                       if (TestSetPageLocked(page)) {
+                               next++;
                                continue;
-
+                       }
+                       if (page->index > next)
+                               next = page->index;
+                       next++;
                        if (PageDirty(page) || PageWriteback(page))
                                goto unlock;
                        if (page_mapped(page))
@@ -266,44 +253,12 @@ unlock:
        return ret;
 }
 
-EXPORT_SYMBOL_GPL(invalidate_mapping_pages);
-
 unsigned long invalidate_inode_pages(struct address_space *mapping)
 {
        return invalidate_mapping_pages(mapping, 0, ~0UL);
 }
-EXPORT_SYMBOL(invalidate_inode_pages);
-
-/*
- * This is like invalidate_complete_page(), except it ignores the page's
- * refcount.  We do this because invalidate_inode_pages2() needs stronger
- * invalidation guarantees, and cannot afford to leave pages behind because
- * shrink_list() has a temp ref on them, or because they're transiently sitting
- * in the lru_cache_add() pagevecs.
- */
-static int
-invalidate_complete_page2(struct address_space *mapping, struct page *page)
-{
-       if (page->mapping != mapping)
-               return 0;
-
-       if (PagePrivate(page) && !try_to_release_page(page, GFP_KERNEL))
-               return 0;
-
-       write_lock_irq(&mapping->tree_lock);
-       if (PageDirty(page))
-               goto failed;
 
-       BUG_ON(PagePrivate(page));
-       __remove_from_page_cache(page);
-       write_unlock_irq(&mapping->tree_lock);
-       ClearPageUptodate(page);
-       page_cache_release(page);       /* pagecache ref */
-       return 1;
-failed:
-       write_unlock_irq(&mapping->tree_lock);
-       return 0;
-}
+EXPORT_SYMBOL(invalidate_inode_pages);
 
 /**
  * invalidate_inode_pages2_range - remove range of pages from an address_space
@@ -371,7 +326,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
                                }
                        }
                        was_dirty = test_clear_page_dirty(page);
-                       if (!invalidate_complete_page2(mapping, page)) {
+                       if (!invalidate_complete_page(mapping, page)) {
                                if (was_dirty)
                                        set_page_dirty(page);
                                ret = -EIO;