diff options
author | Vinayak Menon <vinmenon@codeaurora.org> | 2016-05-09 22:00:44 +0530 |
---|---|---|
committer | Kyle Yan <kyan@codeaurora.org> | 2016-06-07 11:57:44 -0700 |
commit | 6cc2fdb17ca9960481fed5f0920a9bc5f593b12b (patch) | |
tree | 6d88503b3016428bf2b27f5446db13ce775e0b0c /mm/zcache.c | |
parent | b523018fb0223567500a06017091703dede2df8f (diff) |
mm: zcache: fix merge issues
Fix 4.4 merge issues in zero page support, and add the
missing label.
Change-Id: I4bed7add011e0c9b0e148d1b44132ba1873cf607
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Diffstat (limited to 'mm/zcache.c')
-rw-r--r-- | mm/zcache.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/zcache.c b/mm/zcache.c index 86660a6d1060..01473566ed0b 100644 --- a/mm/zcache.c +++ b/mm/zcache.c @@ -660,6 +660,10 @@ static void zcache_store_page(int pool_id, struct cleancache_filekey key, return; } + zero = zero_page(page); + if (zero) + goto zero; + if (zcache_is_full()) { zcache_pool_limit_hit++; if (zbud_reclaim_page(zpool->pool, 8)) { @@ -774,6 +778,7 @@ map: /* update stats */ atomic_dec(&zcache_stored_pages); zpool->size = zbud_get_pool_size(zpool->pool); +out: SetPageWasActive(page); return ret; } |