patch-2.0.20 linux/mm/vmscan.c

• Lines: 27
• Date: Fri Sep 13 15:45:32 1996
• Orig file: v2.0.19/linux/mm/vmscan.c
• Orig date: Wed Sep 11 17:57:19 1996

diff -u --recursive --new-file v2.0.19/linux/mm/vmscan.c linux/mm/vmscan.c
@@ -108,8 +108,13 @@
 		} else {
 			if (page_map->count != 1)
 				return 0;
-			if (!(entry = get_swap_page()))
-				return 0;	/* Aieee!!! Out of swap space! */
+			if (!(entry = get_swap_page())) {
+				/* Aieee!!! Out of swap space! */
+				int retval = -1;
+				if (nr_swapfiles == 0)
+					retval = 0;
+				return retval;
+			}
 			vma->vm_mm->rss--;
 			flush_cache_page(vma, address);
 			set_pte(page_table, __pte(entry));
@@ -312,6 +317,9 @@
 		if (!--p->swap_cnt)
 			swap_task++;
 		switch (swap_out_process(p, dma, wait)) {
+			/* out of swap space? */
+			case -1:
+				return 0;
 			case 0:
 				if (p->swap_cnt)
 					swap_task++;