Messages in this thread Patch in this message | | | Date | Mon, 12 Jun 2006 14:13:16 -0700 (PDT) | From | Christoph Lameter <> | Subject | [PATCH 06/21] Remove nr_mapped from scan controls structure |
| |
Subject: zoned VM stats: Remove nr_mapped from scan control From: Christoph Lameter <clameter@sgi.com>
We can now access the number of pages in a mapped state in an inexpensive way in shrink_active_list. So drop the nr_mapped field from scan_control.
Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
Index: linux-2.6.17-rc6-cl/mm/vmscan.c =================================================================== --- linux-2.6.17-rc6-cl.orig/mm/vmscan.c 2006-06-10 17:25:04.636700267 -0700 +++ linux-2.6.17-rc6-cl/mm/vmscan.c 2006-06-10 19:50:44.835034840 -0700 @@ -48,8 +48,6 @@ struct scan_control { /* Incremented by the number of inactive pages that were scanned */ unsigned long nr_scanned; - unsigned long nr_mapped; /* From page_state */ - /* This context's GFP mask */ gfp_t gfp_mask; @@ -749,7 +747,8 @@ static void shrink_active_list(unsigned * how much memory * is mapped. */ - mapped_ratio = (sc->nr_mapped * 100) / vm_total_pages; + mapped_ratio = (global_page_state(NR_MAPPED) * 100) / + vm_total_pages; /* * Now decide how much we really want to unmap some pages. The @@ -996,7 +995,6 @@ unsigned long try_to_free_pages(struct z } for (priority = DEF_PRIORITY; priority >= 0; priority--) { - sc.nr_mapped = global_page_state(NR_MAPPED); sc.nr_scanned = 0; if (!priority) disable_swap_token(); @@ -1081,7 +1079,6 @@ loop_again: total_scanned = 0; nr_reclaimed = 0; sc.may_writepage = !laptop_mode, - sc.nr_mapped = global_page_state(NR_MAPPED); inc_page_state(pageoutrun); @@ -1416,7 +1413,6 @@ unsigned long shrink_all_memory(unsigned for (prio = DEF_PRIORITY; prio >= 0; prio--) { unsigned long nr_to_scan = nr_pages - ret; - sc.nr_mapped = global_page_state(NR_MAPPED); sc.nr_scanned = 0; ret += shrink_all_zones(nr_to_scan, prio, pass, &sc); @@ -1558,7 +1554,6 @@ static int __zone_reclaim(struct zone *z struct scan_control sc = { .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE), .may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP), - .nr_mapped = global_page_state(NR_MAPPED), .swap_cluster_max = max_t(unsigned long, nr_pages, SWAP_CLUSTER_MAX), .gfp_mask = gfp_mask, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |