evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm: zcache: fix merge issues

Browse source 
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>
This commit is contained in:
Vinayak Menon 2016-05-09 22:00:44 +05:30 • committed by Kyle Yan
parent b523018fb0
commit 6cc2fdb17c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mm/zcache.c
View file

@ -660,6 +660,10 @@ static void zcache_store_page(int pool_id, struct cleancache_filekey key,
return; return;
} }
zero = zero_page(page);
if (zero)
goto zero;
if (zcache_is_full()) { if (zcache_is_full()) {
zcache_pool_limit_hit++; zcache_pool_limit_hit++;
if (zbud_reclaim_page(zpool->pool, 8)) { if (zbud_reclaim_page(zpool->pool, 8)) {
@ -774,6 +778,7 @@ map:
/* update stats */ /* update stats */
atomic_dec(&zcache_stored_pages); atomic_dec(&zcache_stored_pages);
zpool->size = zbud_get_pool_size(zpool->pool); zpool->size = zbud_get_pool_size(zpool->pool);
out:
SetPageWasActive(page); SetPageWasActive(page);
return ret; return ret;
} }