summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-05-14 05:43:18 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-14 05:43:18 -0700
commit3a1e4697cbfc3db774d3d29b80d5ef588cfe1d2e (patch)
treefa71a4f97c8c5874285f8167cbca1a8ab92b6f6f
parente059d5daf158b1bde61883ee5a091cd4875864a9 (diff)
[PATCH] blk_run_page(): fixup for swap_unplug_io_fn()
-rw-r--r--include/linux/swap.h2
-rw-r--r--mm/filemap.c2
-rw-r--r--mm/swapfile.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index f911d8afb8a5..0edc73ed7537 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -181,7 +181,7 @@ extern int vm_swappiness;
extern int shmem_unuse(swp_entry_t entry, struct page *page);
#endif /* CONFIG_MMU */
-extern void swap_unplug_io_fn(struct backing_dev_info *);
+extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
#ifdef CONFIG_SWAP
/* linux/mm/page_io.c */
diff --git a/mm/filemap.c b/mm/filemap.c
index 29848de5d4b4..1b2596a123d5 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -127,7 +127,7 @@ static inline int sync_page(struct page *page)
if (mapping->a_ops && mapping->a_ops->sync_page)
return mapping->a_ops->sync_page(page);
} else if (PageSwapCache(page)) {
- swap_unplug_io_fn(NULL);
+ swap_unplug_io_fn(NULL, page);
}
return 0;
}
diff --git a/mm/swapfile.c b/mm/swapfile.c
index dfcfc43d51ce..512d2e887390 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -88,7 +88,7 @@ static void remove_swap_bdev(struct block_device *bdev)
BUG();
}
-void swap_unplug_io_fn(struct backing_dev_info *unused_bdi)
+void swap_unplug_io_fn(struct backing_dev_info *unused_bdi, struct page *page)
{
int i;