Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 7 deletions

diff --git a/mm/truncate.c b/mm/truncate.c
index b8961cb63414..250505091d37 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -104,7 +104,6 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
         cancel_dirty_page(page, PAGE_CACHE_SIZE);
 
         remove_from_page_cache(page);
-        ClearPageUptodate(page);
         ClearPageMappedToDisk(page);
         page_cache_release(page);       /* pagecache ref */
 }
@@ -188,7 +187,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
                         if (page_index > next)
                                 next = page_index;
                         next++;
-                        if (TestSetPageLocked(page))
+                        if (!trylock_page(page))
                                 continue;
                         if (PageWriteback(page)) {
                                 unlock_page(page);
@@ -281,7 +280,7 @@ unsigned long __invalidate_mapping_pages(struct address_space *mapping,
                         pgoff_t index;
                         int lock_failed;
 
-                        lock_failed = TestSetPageLocked(page);
+                        lock_failed = !trylock_page(page);
 
                         /*
                          * We really shouldn't be looking at the ->index of an
@@ -349,18 +348,17 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page)
         if (PagePrivate(page) && !try_to_release_page(page, GFP_KERNEL))
                 return 0;
 
-        write_lock_irq(&mapping->tree_lock);
+        spin_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);
+        spin_unlock_irq(&mapping->tree_lock);
         page_cache_release(page);       /* pagecache ref */
         return 1;
 failed:
-        write_unlock_irq(&mapping->tree_lock);
+        spin_unlock_irq(&mapping->tree_lock);
         return 0;
 }