From: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
__remove_mapping() only deals with pages with mappings, meaning
page cache and swap cache.
At this point, the page has been removed from the mapping's radix
tree, and we need to ensure that any fs-specific (or swap-
specific) resources are freed up.
We will be using this function from a second location in a
following patch.
Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
---
linux.git-davehans/mm/vmscan.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff -puN mm/vmscan.c~free_mapping_page mm/vmscan.c
--- linux.git/mm/vmscan.c~free_mapping_page 2013-05-07 13:48:14.520080867 -0700
+++ linux.git-davehans/mm/vmscan.c 2013-05-07 13:48:14.524081045 -0700
@@ -497,6 +497,27 @@ static int __remove_mapping_nolock(struc
return 1;
}
+/*
+ * maybe this isnt named the best... it just releases
+ * the mapping's reference to the page. It frees the
+ * page from *the* *mapping* but not necessarily back
+ * in to the allocator
+ */
+static void free_mapping_page(struct address_space *mapping, struct page *page)
+{
+ if (PageSwapCache(page)) {
+ swapcache_free_page_entry(page);
+ set_page_private(page, 0);
+ ClearPageSwapCache(page);
+ } else {
+ void (*freepage)(struct page *);
+ freepage = mapping->a_ops->freepage;
+ mem_cgroup_uncharge_cache_page(page);
+ if (freepage != NULL)
+ freepage(page);
+ }
+}
+
static int __remove_mapping(struct address_space *mapping, struct page *page)
{
int ret;
@@ -510,17 +531,7 @@ static int __remove_mapping(struct addre
if (!ret)
return 0;
- if (PageSwapCache(page)) {
- swapcache_free_page_entry(page);
- set_page_private(page, 0);
- ClearPageSwapCache(page);
- } else {
- void (*freepage)(struct page *);
- freepage = mapping->a_ops->freepage;
- mem_cgroup_uncharge_cache_page(page);
- if (freepage != NULL)
- freepage(page);
- }
+ free_mapping_page(mapping, page);
return ret;
}
_
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>