Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aca8bf32 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

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: default avatarMinchan Kim <minchan.kim@gmail.com>
Acked-by: default avatarHugh Dickins <hugh.dickins@tiscali.co.uk>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8192da6a

include/linux/swap.h

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *); 


#ifdef CONFIG_SWAP

/* 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 void end_swap_bio_read(struct bio *bio, int err);

mm/page_io.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) 
	return ret;

}



int swap_readpage(struct file *file, struct page *page)

int swap_readpage(struct page *page)

{

	struct bio *bio;

	int ret = 0;

mm/swap_state.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

			 */

			lru_cache_add_anon(new_page);

			swap_readpage(NULL, new_page);

			swap_readpage(new_page);

			return new_page;

		}

		ClearPageSwapBacked(new_page);