* mm: frontswap: fix a wrong if condition in frontswap_shrink
@ 2012-09-21 3:29 Zhenzhong Duan
2012-09-21 7:23 ` Dan Carpenter
0 siblings, 1 reply; 2+ messages in thread
From: Zhenzhong Duan @ 2012-09-21 3:29 UTC (permalink / raw)
To: linux-kernel@vger.kernel.org, linux-mm
Cc: Dan Magenheimer, Konrad Rzeszutek Wilk, levinsasha928, Feng Jin
pages_to_unuse is set to 0 to unuse all frontswap pages
But that doesn't happen since a wrong condition in frontswap_shrink
cancels it.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
---
mm/frontswap.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/frontswap.c b/mm/frontswap.c
index 6b3e71a..db2a86f 100644
--- a/mm/frontswap.c
+++ b/mm/frontswap.c
@@ -275,7 +275,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 +302,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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: mm: frontswap: fix a wrong if condition in frontswap_shrink
2012-09-21 3:29 mm: frontswap: fix a wrong if condition in frontswap_shrink Zhenzhong Duan
@ 2012-09-21 7:23 ` Dan Carpenter
0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2012-09-21 7:23 UTC (permalink / raw)
To: Zhenzhong Duan
Cc: linux-kernel@vger.kernel.org, linux-mm, Dan Magenheimer,
Konrad Rzeszutek Wilk, levinsasha928, Feng Jin
On Fri, Sep 21, 2012 at 11:29:56AM +0800, Zhenzhong Duan wrote:
> pages_to_unuse is set to 0 to unuse all frontswap pages
> But that doesn't happen since a wrong condition in frontswap_shrink
> cancels it.
>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
> ---
> mm/frontswap.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/frontswap.c b/mm/frontswap.c
> index 6b3e71a..db2a86f 100644
> --- a/mm/frontswap.c
> +++ b/mm/frontswap.c
> @@ -275,7 +275,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;
> }
This function used to return 0 or an error code. Could we add a
comment at the top saying what the return values mean.
regards,
dan carpenter
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-21 7:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-21 3:29 mm: frontswap: fix a wrong if condition in frontswap_shrink Zhenzhong Duan
2012-09-21 7:23 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).