patch-2.3.11 linux/mm/swapfile.c

• Lines: 20
• Date: Mon Jul 19 23:08:41 1999
• Orig file: v2.3.10/linux/mm/swapfile.c
• Orig date: Wed Jun 30 13:38:20 1999

diff -u --recursive --new-file v2.3.10/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -266,7 +266,7 @@
 	/*
 	 * Go through process' page directory.
 	 */
-	if (!mm || mm == &init_mm)
+	if (!mm)
 		return;
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {
 		pgd_t * pgd = pgd_offset(mm, vma->vm_start);
@@ -661,7 +661,9 @@
 			else
 				p->swap_map[page] = SWAP_MAP_BAD;
 		}
-		nr_good_pages = swap_header->info.last_page - i;
+		nr_good_pages = swap_header->info.last_page -
+				swap_header->info.nr_badpages -
+				1 /* header page */;
 		lock_map_size = (p->max + 7) / 8;
 		if (error) 
 			goto bad_swap;