diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2016-03-15 17:57:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 19:55:16 -0400 |
commit | 62cccb8c8e7a3ca233f49d5e7dcb1557d25465cd (patch) | |
tree | 43a902faf461c65393a4efebf9ff9622017b92b1 /include/linux/pagemap.h | |
parent | 6a93ca8fde3cfce0f00f02281139a377c83e8d8c (diff) |
mm: simplify lock_page_memcg()
Now that migration doesn't clear page->mem_cgroup of live pages anymore,
it's safe to make lock_page_memcg() and the memcg stat functions take
pages, and spare the callers from memcg objects.
[akpm@linux-foundation.org: fix warnings]
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Suggested-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/pagemap.h')
-rw-r--r-- | include/linux/pagemap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 92395a0a7dc5..183b15ea052b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
@@ -663,8 +663,7 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, | |||
663 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, | 663 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, |
664 | pgoff_t index, gfp_t gfp_mask); | 664 | pgoff_t index, gfp_t gfp_mask); |
665 | extern void delete_from_page_cache(struct page *page); | 665 | extern void delete_from_page_cache(struct page *page); |
666 | extern void __delete_from_page_cache(struct page *page, void *shadow, | 666 | extern void __delete_from_page_cache(struct page *page, void *shadow); |
667 | struct mem_cgroup *memcg); | ||
668 | int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); | 667 | int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); |
669 | 668 | ||
670 | /* | 669 | /* |