Subject: [to-be-updated] mm-zswap-check-all-pool-pages-instead-of-one-pools-pages.patch removed from -mm tree
To: cai.liu@xxxxxxxxxxx,bob.liu@xxxxxxxxxx,minchan@xxxxxxxxxx,sjenning@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 14 Jan 2014 14:51:53 -0800
The patch titled
Subject: mm/zswap: check all pool pages instead of one pool's pages
has been removed from the -mm tree. Its filename was
mm-zswap-check-all-pool-pages-instead-of-one-pools-pages.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Cai Liu <cai.liu@xxxxxxxxxxx>
Subject: mm/zswap: check all pool pages instead of one pool's pages
zswap can support multiple swapfiles. So we need to check all zbud pool
pages in zswap.
Signed-off-by: Cai Liu <cai.liu@xxxxxxxxxxx>
Cc: Seth Jennings <sjenning@xxxxxxxxxxxxxxxxxx>
Cc: Bob Liu <bob.liu@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/zswap.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff -puN mm/zswap.c~mm-zswap-check-all-pool-pages-instead-of-one-pool-pages mm/zswap.c
--- a/mm/zswap.c~mm-zswap-check-all-pool-pages-instead-of-one-pool-pages
+++ a/mm/zswap.c
@@ -291,7 +291,6 @@ static void zswap_free_entry(struct zswa
zbud_free(tree->pool, entry->handle);
zswap_entry_cache_free(entry);
atomic_dec(&zswap_stored_pages);
- zswap_pool_pages = zbud_get_pool_size(tree->pool);
}
/* caller must hold the tree lock */
@@ -405,10 +404,24 @@ cleanup:
/*********************************
* helpers
**********************************/
+static u64 get_zswap_pool_pages(void)
+{
+ int i;
+ u64 pool_pages = 0;
+
+ for (i = 0; i < MAX_SWAPFILES; i++) {
+ if (zswap_trees[i])
+ pool_pages += zbud_get_pool_size(zswap_trees[i]->pool);
+ }
+ zswap_pool_pages = pool_pages;
+
+ return pool_pages;
+}
+
static bool zswap_is_full(void)
{
return (totalram_pages * zswap_max_pool_percent / 100 <
- zswap_pool_pages);
+ get_zswap_pool_pages());
}
/*********************************
@@ -716,7 +729,6 @@ static int zswap_frontswap_store(unsigne
/* update stats */
atomic_inc(&zswap_stored_pages);
- zswap_pool_pages = zbud_get_pool_size(tree->pool);
return 0;
_
Patches currently in -mm which might be from cai.liu@xxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
