patch-2.4.17 linux/mm/vmscan.c

• Lines: 17
• Date: Fri Dec 21 16:40:33 2001
• Orig file: linux-2.4.16/mm/vmscan.c
• Orig date: Sun Nov 18 03:18:17 2001

diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.16/mm/vmscan.c linux/mm/vmscan.c
@@ -338,7 +338,7 @@
 {
 	struct list_head * entry;
 	int max_scan = nr_inactive_pages / priority;
-	int max_mapped = nr_pages << (9 - priority);
+	int max_mapped = min((nr_pages << (10 - priority)), max_scan / 10);
 
 	spin_lock(&pagemap_lru_lock);
 	while (--max_scan >= 0 && (entry = inactive_list.prev) != &inactive_list) {
@@ -588,6 +588,7 @@
 	int priority = DEF_PRIORITY;
 	int nr_pages = SWAP_CLUSTER_MAX;
 
+	gfp_mask = pf_gfp_mask(gfp_mask);
 	do {
 		nr_pages = shrink_caches(classzone, priority, gfp_mask, nr_pages);
 		if (nr_pages <= 0)