patch-2.4.19 linux-2.4.19/mm/swapfile.c

• Lines: 20
• Date: Fri Aug 2 17:39:46 2002
• Orig file: linux-2.4.18/mm/swapfile.c
• Orig date: Mon Feb 25 11:38:14 2002

diff -urN linux-2.4.18/mm/swapfile.c linux-2.4.19/mm/swapfile.c
@@ -14,7 +14,6 @@
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/shm.h>
-#include <linux/compiler.h>
 
 #include <asm/pgtable.h>
 
@@ -672,10 +671,7 @@
 		 * private" pages, but they are handled by tmpfs files.
 		 * Note shmem_unuse already deleted its from swap cache.
 		 */
-		swcount = *swap_map;
-		if ((swcount > 0) != PageSwapCache(page))
-			BUG();
-		if ((swcount > 1) && PageDirty(page)) {
+		if ((*swap_map > 1) && PageDirty(page) && PageSwapCache(page)) {
 			rw_swap_page(WRITE, page);
 			lock_page(page);
 		}