patch-2.3.24 linux/mm/vmscan.c

• Lines: 35
• Date: Mon Oct 25 11:14:33 1999
• Orig file: v2.3.23/linux/mm/vmscan.c
• Orig date: Fri Oct 22 13:21:55 1999

diff -u --recursive --new-file v2.3.23/linux/mm/vmscan.c linux/mm/vmscan.c
@@ -18,6 +18,7 @@
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/highmem.h>
+#include <linux/file.h>
 
 #include <asm/pgtable.h>
 
@@ -36,6 +37,7 @@
 {
 	pte_t pte, entry;
 	struct page * page;
+	int (*swapout)(struct page *, struct file *);
 
 	pte = *page_table;
 	if (!pte_present(pte))
@@ -126,13 +128,16 @@
 	 * That would get rid of a lot of problems.
 	 */
 	flush_cache_page(vma, address);
-	if (vma->vm_ops && vma->vm_ops->swapout) {
+	if (vma->vm_ops && (swapout = vma->vm_ops->swapout)) {
 		int error;
+		struct file *file = vma->vm_file;
+		if (file) get_file(file);
 		pte_clear(page_table);
 		vma->vm_mm->rss--;
 		flush_tlb_page(vma, address);
 		vmlist_access_unlock(vma->vm_mm);
-		error = vma->vm_ops->swapout(vma, page);
+		error = swapout(page, file);
+		if (file) fput(file);
 		if (!error)
 			goto out_free_success;
 		__free_page(page);