[PATCH] __add_to_swap_cache and add_to_pagecache() simplification

Simplify the logic in there a bit.

diff --git a/mm/filemap.c b/mm/filemap.c
index 38da105bbe0fbc2240aed8eefe02c2c1f94b59d7..b4dd01c24fb3c0a06500692850d01e865796f545 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -252,17 +252,15 @@ int add_to_page_cache(struct page *page, struct address_space *mapping,
        int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
 
        if (error == 0) {
-               page_cache_get(page);
                spin_lock_irq(&mapping->tree_lock);
                error = radix_tree_insert(&mapping->page_tree, offset, page);
                if (!error) {
+                       page_cache_get(page);
                        SetPageLocked(page);
                        page->mapping = mapping;
                        page->index = offset;
                        mapping->nrpages++;
                        pagecache_acct(1);
-               } else {
-                       page_cache_release(page);
                }
                spin_unlock_irq(&mapping->tree_lock);
                radix_tree_preload_end();

diff --git a/mm/swap_state.c b/mm/swap_state.c
index fd18d031e8e748f99a9d864e72200a6b3c823b34..cc7a51f698709eeaabe7edcb700c373f1d5b5700 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -68,18 +68,17 @@ static int __add_to_swap_cache(struct page *page,
        BUG_ON(PagePrivate(page));
        error = radix_tree_preload(gfp_mask);
        if (!error) {
-               page_cache_get(page);
                spin_lock_irq(&swapper_space.tree_lock);
                error = radix_tree_insert(&swapper_space.page_tree,
                                                entry.val, page);
                if (!error) {
+                       page_cache_get(page);
                        SetPageLocked(page);
                        SetPageSwapCache(page);
                        page->private = entry.val;
                        total_swapcache_pages++;
                        pagecache_acct(1);
-               } else
-                       page_cache_release(page);
+               }
                spin_unlock_irq(&swapper_space.tree_lock);
                radix_tree_preload_end();
        }