swapin_readahead: move and rearrange args
commit46017e954826ac59e91df76341a3f76b45467847
authorHugh Dickins <hugh@veritas.com>
Tue, 5 Feb 2008 06:28:41 +0000 (4 22:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 5 Feb 2008 17:44:14 +0000 (5 09:44 -0800)
tree711a35e3936118665d0eac2afeef8758b4f4e95f
parentc4cc6d07b2f465fbf5efd99bbe772a49c515f3f2
swapin_readahead: move and rearrange args

swapin_readahead has never sat well in mm/memory.c: move it to mm/swap_state.c
beside its kindred read_swap_cache_async.  Why were its args in a different
order?  rearrange them.  And since it was always followed by a
read_swap_cache_async of the target page, fold that in and return struct
page*.  Then CONFIG_SWAP=n no longer needs valid_swaphandles and
read_swap_cache_async stubs.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-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>
include/linux/swap.h
mm/memory.c
mm/shmem.c
mm/swap_state.c