diff options
author | Minchan Kim <minchan.kim@gmail.com> | 2009-06-16 18:33:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:47:44 -0400 |
commit | aca8bf323edd31ad462dc98c107c23a5c6022ca2 (patch) | |
tree | 1466785c7ab056d6a9e21bb61fbd36ce3c3df5cc | |
parent | 8192da6a8811ab6c3d29dc590a5f94a377c43739 (diff) |
mm: remove file argument from swap_readpage()
The file argument resulted from address_space's readpage long time ago.
We don't use it any more. Let's remove unnecessary argement.
Signed-off-by: Minchan Kim <minchan.kim@gmail.com>
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Reviewed-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/swap.h | 2 | ||||
-rw-r--r-- | mm/page_io.c | 2 | ||||
-rw-r--r-- | mm/swap_state.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index fed5e8e1104b..0cedf31af0b0 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -256,7 +256,7 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *); | |||
256 | 256 | ||
257 | #ifdef CONFIG_SWAP | 257 | #ifdef CONFIG_SWAP |
258 | /* linux/mm/page_io.c */ | 258 | /* linux/mm/page_io.c */ |
259 | extern int swap_readpage(struct file *, struct page *); | 259 | extern int swap_readpage(struct page *); |
260 | extern int swap_writepage(struct page *page, struct writeback_control *wbc); | 260 | extern int swap_writepage(struct page *page, struct writeback_control *wbc); |
261 | extern void end_swap_bio_read(struct bio *bio, int err); | 261 | extern void end_swap_bio_read(struct bio *bio, int err); |
262 | 262 | ||
diff --git a/mm/page_io.c b/mm/page_io.c index 3023c475e041..c6f3e5071de3 100644 --- a/mm/page_io.c +++ b/mm/page_io.c | |||
@@ -120,7 +120,7 @@ out: | |||
120 | return ret; | 120 | return ret; |
121 | } | 121 | } |
122 | 122 | ||
123 | int swap_readpage(struct file *file, struct page *page) | 123 | int swap_readpage(struct page *page) |
124 | { | 124 | { |
125 | struct bio *bio; | 125 | struct bio *bio; |
126 | int ret = 0; | 126 | int ret = 0; |
diff --git a/mm/swap_state.c b/mm/swap_state.c index b62e7f56051c..42cd38eba79f 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c | |||
@@ -313,7 +313,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, | |||
313 | * Initiate read into locked page and return. | 313 | * Initiate read into locked page and return. |
314 | */ | 314 | */ |
315 | lru_cache_add_anon(new_page); | 315 | lru_cache_add_anon(new_page); |
316 | swap_readpage(NULL, new_page); | 316 | swap_readpage(new_page); |
317 | return new_page; | 317 | return new_page; |
318 | } | 318 | } |
319 | ClearPageSwapBacked(new_page); | 319 | ClearPageSwapBacked(new_page); |