patch-2.0.34 linux/mm/swap_state.c

• Lines: 36
• Date: Wed Jun 3 15:17:50 1998
• Orig file: v2.0.33/linux/mm/swap_state.c
• Orig date: Wed Mar 13 05:17:23 1996

diff -u --recursive --new-file v2.0.33/linux/mm/swap_state.c linux/mm/swap_state.c
@@ -81,6 +81,12 @@
 	return (unsigned long) (swap_cache + swap_cache_size);
 }
 
+/* We shouldn't be able to have more processes sharing a swapped page than
+   we can count in the swap map */
+#if NR_TASKS > SWAP_MAP_MAX
+#error SWAP_MAP_MAX is too small
+#endif
+
 void swap_duplicate(unsigned long entry)
 {
 	struct swap_info_struct * p;
@@ -98,14 +104,16 @@
 	}
 	p = type + swap_info;
 	if (offset >= p->max) {
-		printk("swap_duplicate: weirdness\n");
-		return;
-	}
-	if (!p->swap_map[offset]) {
-		printk("swap_duplicate: trying to duplicate unused page\n");
+		printk("swap_duplicate: weirdness, entry %08lx\n", entry);
 		return;
 	}
-	p->swap_map[offset]++;
+	if (!p->swap_map[offset])
+		printk("swap_duplicate: trying to duplicate unused page, "
+		       "entry %08lx\n", entry);
+	else if (p->swap_map[offset] == SWAP_MAP_RESERVED)
+		printk("swap_duplicate: trying to duplicate reserved page, "
+		       "entry %08lx\n", entry);
+	else p->swap_map[offset]++;
 	return;
 }