linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm/vsmcan: check shrink_active_list() sc->isolate_pages() return value.
@ 2009-08-31 22:54 Vincent Li
  2009-08-31 23:29 ` Minchan Kim
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Vincent Li @ 2009-08-31 22:54 UTC (permalink / raw)
  To: linux-mm
  Cc: KOSAKI Motohiro, Rik van Riel, Minchan Kim, Wu Fengguang,
	Andrew Morton, Vincent Li

commit 5343daceec (If sc->isolate_pages() return 0...) make shrink_inactive_list handle
sc->isolate_pages() return value properly. Add similar proper return value check for
shrink_active_list() sc->isolate_pages().

Signed-off-by: Vincent Li <macli@brc.ubc.ca>
---
 mm/vmscan.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 460a6f7..2d1c846 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1319,9 +1319,12 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
 	if (scanning_global_lru(sc)) {
 		zone->pages_scanned += pgscanned;
 	}
-	reclaim_stat->recent_scanned[file] += nr_taken;
-
 	__count_zone_vm_events(PGREFILL, zone, pgscanned);
+
+	if (nr_taken == 0)
+		goto done;
+
+	reclaim_stat->recent_scanned[file] += nr_taken;
 	if (file)
 		__mod_zone_page_state(zone, NR_ACTIVE_FILE, -nr_taken);
 	else
@@ -1383,6 +1386,8 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
 	__mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken);
 	__mod_zone_page_state(zone, LRU_ACTIVE + file * LRU_FILE, nr_rotated);
 	__mod_zone_page_state(zone, LRU_BASE + file * LRU_FILE, nr_deactivated);
+
+done:
 	spin_unlock_irq(&zone->lru_lock);
 }
 
-- 
1.6.0.4

--
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] 8+ messages in thread

end of thread, other threads:[~2009-09-01  4:40 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-31 22:54 [PATCH] mm/vsmcan: check shrink_active_list() sc->isolate_pages() return value Vincent Li
2009-08-31 23:29 ` Minchan Kim
2009-09-01  0:01   ` Vincent Li
2009-09-01  0:12     ` Minchan Kim
2009-09-01  0:43       ` KOSAKI Motohiro
2009-09-01  4:56         ` Vincent Li
2009-08-31 23:42 ` Rik van Riel
2009-09-01  1:56 ` Wu Fengguang

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).