patch-2.1.123 linux/include/linux/swap.h

• Lines: 33
• Date: Sun Sep 27 19:08:09 1998
• Orig file: v2.1.122/linux/include/linux/swap.h
• Orig date: Sat Sep 5 16:46:41 1998

diff -u --recursive --new-file v2.1.122/linux/include/linux/swap.h linux/include/linux/swap.h
@@ -89,6 +89,7 @@
 extern int swap_check_entry(unsigned long);
 extern struct page * read_swap_cache_async(unsigned long, int);
 #define read_swap_cache(entry) read_swap_cache_async(entry, 1);
+extern int FASTCALL(swap_count(unsigned long));
 /*
  * Make these inline later once they are working properly.
  */
@@ -146,14 +147,20 @@
  */
 static inline int is_page_shared(struct page *page)
 {
-	int count = atomic_read(&page->count);
+	unsigned int count;
 	if (PageReserved(page))
 		return 1;
-	if (page->inode == &swapper_inode)
-		count--;
+	count = atomic_read(&page->count);
+	if (PageSwapCache(page))
+	{
+		/* PARANOID */
+		if (page->inode != &swapper_inode)
+			panic("swap cache page has wrong inode\n");
+		count += swap_count(page->offset) - 2;
+	}
 	if (PageFreeAfter(page))
 		count--;
-	return (count > 1);
+	return  count > 1;
 }
 
 #endif /* __KERNEL__*/