patch-2.2.11 linux/mm/swapfile.c

• Lines: 18
• Date: Mon Aug 9 12:04:41 1999
• Orig file: v2.2.10/linux/mm/swapfile.c
• Orig date: Mon Jun 7 16:27:06 1999

diff -u --recursive --new-file v2.2.10/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -5,7 +5,6 @@
  *  Swap reorganised 29.12.95, Stephen Tweedie
  */
 
-#include <linux/config.h>
 #include <linux/malloc.h>
 #include <linux/smp_lock.h>
 #include <linux/kernel_stat.h>
@@ -649,7 +648,8 @@
 			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;
 		lock_map_size = (p->max + 7) / 8;
 		if (error) 
 			goto bad_swap;