patch-2.2.3 linux/mm/swapfile.c

• Lines: 18
• Date: Sun Mar 7 15:49:14 1999
• Orig file: v2.2.2/linux/mm/swapfile.c
• Orig date: Wed Jan 20 23:14:07 1999

diff -u --recursive --new-file v2.2.2/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -556,7 +556,7 @@
 		for (i = 0 ; i < nr_swapfiles ; i++) {
 			if (i == type)
 				continue;
-			if (p->swap_file == swap_info[i].swap_file)
+			if (swap_dentry->d_inode == swap_info[i].swap_file->d_inode)
 				goto bad_swap;
 		}
 	} else
@@ -701,6 +701,8 @@
 	p->swap_map = NULL;
 	p->swap_lockmap = NULL;
 	p->flags = 0;
+	if (!(swap_flags & SWAP_FLAG_PREFER))
+		++least_priority;
 out:
 	if (swap_header)
 		free_page((long) swap_header);