瀏覽代碼

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>
Minchan Kim 16 年之前
父節點
當前提交
aca8bf323e
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      include/linux/swap.h
  2. 1 1
      mm/page_io.c
  3. 1 1
      mm/swap_state.c

+ 1 - 1
include/linux/swap.h

@@ -256,7 +256,7 @@ 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 */
-extern int swap_readpage(struct file *, struct page *);
+extern int swap_readpage(struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
 extern void end_swap_bio_read(struct bio *bio, int err);
 extern void end_swap_bio_read(struct bio *bio, int err);
 
 

+ 1 - 1
mm/page_io.c

@@ -120,7 +120,7 @@ out:
 	return ret;
 	return ret;
 }
 }
 
 
-int swap_readpage(struct file *file, struct page *page)
+int swap_readpage(struct page *page)
 {
 {
 	struct bio *bio;
 	struct bio *bio;
 	int ret = 0;
 	int ret = 0;

+ 1 - 1
mm/swap_state.c

@@ -313,7 +313,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
 			 * Initiate read into locked page and return.
 			 * Initiate read into locked page and return.
 			 */
 			 */
 			lru_cache_add_anon(new_page);
 			lru_cache_add_anon(new_page);
-			swap_readpage(NULL, new_page);
+			swap_readpage(new_page);
 			return new_page;
 			return new_page;
 		}
 		}
 		ClearPageSwapBacked(new_page);
 		ClearPageSwapBacked(new_page);