diff options
author | Mel Gorman <mgorman@suse.de> | 2012-07-31 19:44:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:47 -0400 |
commit | f981c5950fa85916ba49bea5d9a7a5078f47e569 (patch) | |
tree | e742598755e57e1bbed06dc90b05fe6e13091236 /mm | |
parent | 6290c2c439732727899405f39fb76c2f5585b707 (diff) |
mm: methods for teaching filesystems about PG_swapcache pages
In order to teach filesystems to handle swap cache pages, three new page
functions are introduced:
pgoff_t page_file_index(struct page *);
loff_t page_file_offset(struct page *);
struct address_space *page_file_mapping(struct page *);
page_file_index() - gives the offset of this page in the file in
PAGE_CACHE_SIZE blocks. Like page->index is for mapped pages, this
function also gives the correct index for PG_swapcache pages.
page_file_offset() - uses page_file_index(), so that it will give the
expected result, even for PG_swapcache pages.
page_file_mapping() - gives the mapping backing the actual page; that is
for swap cache pages it will give swap_file->f_mapping.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric B Munson <emunson@mgebm.net>
Cc: Eric Paris <eparis@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Neil Brown <neilb@suse.de>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Xiaotian Feng <dfeng@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/swapfile.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 71373d03fcee..f89af5ba2eb2 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/oom.h> | 33 | #include <linux/oom.h> |
34 | #include <linux/frontswap.h> | 34 | #include <linux/frontswap.h> |
35 | #include <linux/swapfile.h> | 35 | #include <linux/swapfile.h> |
36 | #include <linux/export.h> | ||
36 | 37 | ||
37 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
38 | #include <asm/tlbflush.h> | 39 | #include <asm/tlbflush.h> |
@@ -2285,6 +2286,31 @@ int swapcache_prepare(swp_entry_t entry) | |||
2285 | return __swap_duplicate(entry, SWAP_HAS_CACHE); | 2286 | return __swap_duplicate(entry, SWAP_HAS_CACHE); |
2286 | } | 2287 | } |
2287 | 2288 | ||
2289 | struct swap_info_struct *page_swap_info(struct page *page) | ||
2290 | { | ||
2291 | swp_entry_t swap = { .val = page_private(page) }; | ||
2292 | BUG_ON(!PageSwapCache(page)); | ||
2293 | return swap_info[swp_type(swap)]; | ||
2294 | } | ||
2295 | |||
2296 | /* | ||
2297 | * out-of-line __page_file_ methods to avoid include hell. | ||
2298 | */ | ||
2299 | struct address_space *__page_file_mapping(struct page *page) | ||
2300 | { | ||
2301 | VM_BUG_ON(!PageSwapCache(page)); | ||
2302 | return page_swap_info(page)->swap_file->f_mapping; | ||
2303 | } | ||
2304 | EXPORT_SYMBOL_GPL(__page_file_mapping); | ||
2305 | |||
2306 | pgoff_t __page_file_index(struct page *page) | ||
2307 | { | ||
2308 | swp_entry_t swap = { .val = page_private(page) }; | ||
2309 | VM_BUG_ON(!PageSwapCache(page)); | ||
2310 | return swp_offset(swap); | ||
2311 | } | ||
2312 | EXPORT_SYMBOL_GPL(__page_file_index); | ||
2313 | |||
2288 | /* | 2314 | /* |
2289 | * add_swap_count_continuation - called when a swap count is duplicated | 2315 | * add_swap_count_continuation - called when a swap count is duplicated |
2290 | * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's | 2316 | * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's |