From 93a1822fe7065414578ad77bf3a505ff5880a8a0 Mon Sep 17 00:00:00 2001 From: Ryo Munakata Date: Sat, 26 Jan 2013 19:50:53 +0900 Subject: [PATCH] --- yaml --- r: 354268 b: refs/heads/master c: 05014d73d68a0f5203fc78eb58e6d7e512581695 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/zcache/zcache-main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 949af2809cda..4853a44051d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2643c47fa4accb49abf46a1486909e20e4bb5df9 +refs/heads/master: 05014d73d68a0f5203fc78eb58e6d7e512581695 diff --git a/trunk/drivers/staging/zcache/zcache-main.c b/trunk/drivers/staging/zcache/zcache-main.c index 6ab13e123e7b..c1ac905759bd 100644 --- a/trunk/drivers/staging/zcache/zcache-main.c +++ b/trunk/drivers/staging/zcache/zcache-main.c @@ -1017,11 +1017,10 @@ static int zcache_frontswap_unuse(void) unuse_ret = frontswap_unuse(type, offset, newpage2 != NULL ? newpage2 : evictpage2, ZCACHE_GFP_MASK); - if (unuse_ret != 0) { + if (unuse_ret != 0) goto free_and_out; - } else if (evictpage2 != NULL) { + else if (evictpage2 != NULL) zcache_unacct_page(); - } } ret = 0; goto out;