From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx117.postini.com [74.125.245.117]) by kanga.kvack.org (Postfix) with SMTP id 101B06B002B for ; Fri, 21 Sep 2012 04:39:21 -0400 (EDT) Message-ID: <505C27FE.5080205@oracle.com> Date: Fri, 21 Sep 2012 16:40:30 +0800 From: Zhenzhong Duan Reply-To: zhenzhong.duan@oracle.com MIME-Version: 1.0 Subject: [PATCH -v2] mm: frontswap: fix a wrong if condition in frontswap_shrink Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: "linux-kernel@vger.kernel.org" , linux-mm@kvack.org Cc: Dan Magenheimer , Konrad Rzeszutek Wilk , levinsasha928@gmail.com, Feng Jin , dan.carpenter@oracle.com, "zhenzhong.duan" pages_to_unuse is set to 0 to unuse all frontswap pages But that doesn't happen since a wrong condition in frontswap_shrink cancel it. -v2: Add comment to explain return value of __frontswap_shrink, as suggested by Dan Carpenter, thanks Signed-off-by: Zhenzhong Duan diff --git a/mm/frontswap.c b/mm/frontswap.c index 6b3e71a..e38fc39 100644 --- a/mm/frontswap.c +++ b/mm/frontswap.c @@ -263,6 +263,11 @@ static int __frontswap_unuse_pages(unsigned long total, unsigned long *unused, return ret; } +/* + * Used to check if it's necessory and feasible to unuse pages. + * Return 1 when nothing to do, 0 when need to shink pages, + * error code when there is an error. + */ static int __frontswap_shrink(unsigned long target_pages, unsigned long *pages_to_unuse, int *type) @@ -275,7 +280,7 @@ static int __frontswap_shrink(unsigned long target_pages, if (total_pages <= target_pages) { /* Nothing to do */ *pages_to_unuse = 0; - return 0; + return 1; } total_pages_to_unuse = total_pages - target_pages; return __frontswap_unuse_pages(total_pages_to_unuse, pages_to_unuse, type); @@ -302,7 +307,7 @@ void frontswap_shrink(unsigned long target_pages) spin_lock(&swap_lock); ret = __frontswap_shrink(target_pages, &pages_to_unuse, &type); spin_unlock(&swap_lock); - if (ret == 0 && pages_to_unuse) + if (ret == 0) try_to_unuse(type, true, pages_to_unuse); return; } -- 1.7.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org