aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/shmem_fs.h
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2011-08-03 19:21:24 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 20:25:24 -0400
commitaa3b189551ad8e5cc1d9c663735c131650238278 (patch)
treec789ab5c7f890a6065811d8bba15a784caf9e859 /include/linux/shmem_fs.h
parent54af60421822bb9cb664dd5cd7aac46c01ccfcf8 (diff)
tmpfs: convert mem_cgroup shmem to radix-swap
Remove mem_cgroup_shmem_charge_fallback(): it was only required when we had to move swappage to filecache with GFP_NOWAIT. Remove the GFP_NOWAIT special case from mem_cgroup_cache_charge(), by moving its call out from shmem_add_to_page_cache() to two of thats three callers. But leave it doing mem_cgroup_uncharge_cache_page() on error: although asymmetrical, it's easier for all 3 callers to handle. These two changes would also be appropriate if anyone were to start using shmem_read_mapping_page_gfp() with GFP_NOWAIT. Remove mem_cgroup_get_shmem_target(): mc_handle_file_pte() can test radix_tree_exceptional_entry() to get what it needs for itself. Signed-off-by: Hugh Dickins <hughd@google.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>
Diffstat (limited to 'include/linux/shmem_fs.h')
-rw-r--r--include/linux/shmem_fs.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 3f05795dcf7b..0c8e952df594 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -57,8 +57,6 @@ extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,
57 pgoff_t index, gfp_t gfp_mask); 57 pgoff_t index, gfp_t gfp_mask);
58extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); 58extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end);
59extern int shmem_unuse(swp_entry_t entry, struct page *page); 59extern int shmem_unuse(swp_entry_t entry, struct page *page);
60extern void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff,
61 struct page **pagep, swp_entry_t *ent);
62 60
63static inline struct page *shmem_read_mapping_page( 61static inline struct page *shmem_read_mapping_page(
64 struct address_space *mapping, pgoff_t index) 62 struct address_space *mapping, pgoff_t index)