aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/frontswap.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/mm/frontswap.c b/mm/frontswap.c
index 89dc399d3328..0547a35f798b 100644
--- a/mm/frontswap.c
+++ b/mm/frontswap.c
@@ -263,6 +263,11 @@ static int __frontswap_unuse_pages(unsigned long total, unsigned long *unused,
263 return ret; 263 return ret;
264} 264}
265 265
266/*
267 * Used to check if it's necessory and feasible to unuse pages.
268 * Return 1 when nothing to do, 0 when need to shink pages,
269 * error code when there is an error.
270 */
266static int __frontswap_shrink(unsigned long target_pages, 271static int __frontswap_shrink(unsigned long target_pages,
267 unsigned long *pages_to_unuse, 272 unsigned long *pages_to_unuse,
268 int *type) 273 int *type)
@@ -275,7 +280,7 @@ static int __frontswap_shrink(unsigned long target_pages,
275 if (total_pages <= target_pages) { 280 if (total_pages <= target_pages) {
276 /* Nothing to do */ 281 /* Nothing to do */
277 *pages_to_unuse = 0; 282 *pages_to_unuse = 0;
278 return 0; 283 return 1;
279 } 284 }
280 total_pages_to_unuse = total_pages - target_pages; 285 total_pages_to_unuse = total_pages - target_pages;
281 return __frontswap_unuse_pages(total_pages_to_unuse, pages_to_unuse, type); 286 return __frontswap_unuse_pages(total_pages_to_unuse, pages_to_unuse, type);
@@ -302,7 +307,7 @@ void frontswap_shrink(unsigned long target_pages)
302 spin_lock(&swap_lock); 307 spin_lock(&swap_lock);
303 ret = __frontswap_shrink(target_pages, &pages_to_unuse, &type); 308 ret = __frontswap_shrink(target_pages, &pages_to_unuse, &type);
304 spin_unlock(&swap_lock); 309 spin_unlock(&swap_lock);
305 if (ret == 0 && pages_to_unuse) 310 if (ret == 0)
306 try_to_unuse(type, true, pages_to_unuse); 311 try_to_unuse(type, true, pages_to_unuse);
307 return; 312 return;
308} 313}