Commit 3a1e4697 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] blk_run_page(): fixup for swap_unplug_io_fn()

parent e059d5da
...@@ -181,7 +181,7 @@ extern int vm_swappiness; ...@@ -181,7 +181,7 @@ extern int vm_swappiness;
extern int shmem_unuse(swp_entry_t entry, struct page *page); extern int shmem_unuse(swp_entry_t entry, struct page *page);
#endif /* CONFIG_MMU */ #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 #ifdef CONFIG_SWAP
/* linux/mm/page_io.c */ /* linux/mm/page_io.c */
......
...@@ -127,7 +127,7 @@ static inline int sync_page(struct page *page) ...@@ -127,7 +127,7 @@ static inline int sync_page(struct page *page)
if (mapping->a_ops && mapping->a_ops->sync_page) if (mapping->a_ops && mapping->a_ops->sync_page)
return mapping->a_ops->sync_page(page); return mapping->a_ops->sync_page(page);
} else if (PageSwapCache(page)) { } else if (PageSwapCache(page)) {
swap_unplug_io_fn(NULL); swap_unplug_io_fn(NULL, page);
} }
return 0; return 0;
} }
......
...@@ -88,7 +88,7 @@ static void remove_swap_bdev(struct block_device *bdev) ...@@ -88,7 +88,7 @@ static void remove_swap_bdev(struct block_device *bdev)
BUG(); 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; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment