This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / page-writeback.c

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index a226c7c..f6ba49e 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -607,13 +607,12 @@ int __set_page_dirty_nobuffers(struct page *page)
 
        if (!TestSetPageDirty(page)) {
                struct address_space *mapping = page_mapping(page);
-               struct address_space *mapping2;
 
                if (mapping) {
                        spin_lock_irq(&mapping->tree_lock);
-                       mapping2 = page_mapping(page);
-                       if (mapping2) { /* Race with truncate? */
-                               BUG_ON(mapping2 != mapping);
+                       mapping = page_mapping(page);
+                       if (page_mapping(page)) { /* Race with truncate? */
+                               BUG_ON(page_mapping(page) != mapping);
                                if (!mapping->backing_dev_info->memory_backed)
                                        inc_page_state(nr_dirty);
                                radix_tree_tag_set(&mapping->page_tree,