From af6f2c3e28f594847e86b87a018103ee1fb48cf3 Mon Sep 17 00:00:00 2001 From: Balbir Singh Date: Thu, 7 Feb 2008 00:14:05 -0800 Subject: [PATCH] --- yaml --- r: 83771 b: refs/heads/master c: 35c754d79f4da80d5e8972f6403dd26f7962fd88 h: refs/heads/master i: 83769: fdd03f34a87b4de328405eef25a6ad5ad10a105b 83767: 36763e7fbb7dce464c7d77dd5f2289086ccda768 v: v3 --- [refs] | 2 +- trunk/mm/filemap.c | 13 ++++++------- trunk/mm/swap_state.c | 13 +++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 09a0390cdf1c..ae01e35ed032 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 044d66c1d2b1c5aa50b4d6d68c21c6c93dd678da +refs/heads/master: 35c754d79f4da80d5e8972f6403dd26f7962fd88 diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 63040d5e0ae2..35867ab72640 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -460,14 +460,12 @@ int filemap_write_and_wait_range(struct address_space *mapping, int add_to_page_cache(struct page *page, struct address_space *mapping, pgoff_t offset, gfp_t gfp_mask) { - int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM); + int error = mem_cgroup_cache_charge(page, current->mm, gfp_mask); + if (error) + goto out; + error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM); if (error == 0) { - - error = mem_cgroup_cache_charge(page, current->mm, gfp_mask); - if (error) - goto out; - write_lock_irq(&mapping->tree_lock); error = radix_tree_insert(&mapping->page_tree, offset, page); if (!error) { @@ -482,7 +480,8 @@ int add_to_page_cache(struct page *page, struct address_space *mapping, write_unlock_irq(&mapping->tree_lock); radix_tree_preload_end(); - } + } else + mem_cgroup_uncharge_page(page); out: return error; } diff --git a/trunk/mm/swap_state.c b/trunk/mm/swap_state.c index 581b609e748d..6ce0669acedc 100644 --- a/trunk/mm/swap_state.c +++ b/trunk/mm/swap_state.c @@ -75,13 +75,13 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask) BUG_ON(!PageLocked(page)); BUG_ON(PageSwapCache(page)); BUG_ON(PagePrivate(page)); - error = radix_tree_preload(gfp_mask); - if (!error) { - error = mem_cgroup_cache_charge(page, current->mm, gfp_mask); - if (error) - goto out; + error = mem_cgroup_cache_charge(page, current->mm, gfp_mask); + if (error) + goto out; + error = radix_tree_preload(gfp_mask); + if (!error) { write_lock_irq(&swapper_space.tree_lock); error = radix_tree_insert(&swapper_space.page_tree, entry.val, page); @@ -97,7 +97,8 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask) } write_unlock_irq(&swapper_space.tree_lock); radix_tree_preload_end(); - } + } else + mem_cgroup_uncharge_page(page); out: return error; }