patch-2.3.99-pre4 linux/mm/swapfile.c

• Lines: 18
• Date: Mon Apr 3 16:31:42 2000
• Orig file: v2.3.99-pre3/linux/mm/swapfile.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -207,7 +207,7 @@
 	unsigned long offset, type;
 	swp_entry_t entry;
 
-	if (!test_bit(PG_swap_entry, &page->flags))
+	if (!PageSwapEntry(page))
 		goto new_swap_entry;
 
 	/* We have the old entry in the page offset still */
@@ -538,7 +538,7 @@
 	len += sprintf(buf, "Filename\t\t\tType\t\tSize\tUsed\tPriority\n");
 	for (i = 0 ; i < nr_swapfiles ; i++, ptr++) {
 		if (ptr->flags & SWP_USED) {
-			char * path = d_path(ptr->swap_file, page, PAGE_SIZE);
+			char * path = d_path(ptr->swap_file, NULL, page, PAGE_SIZE);
 
 			len += sprintf(buf + len, "%-31s ", path);