mm: unify remaining mem_cont, mem, etc. variable names to memcg

Signed-off-by: Johannes Weiner <jweiner@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/mm/rmap.c b/mm/rmap.c
index a2e5ce1fa081..c8454e06b6c8 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -773,7 +773,7 @@ out:
 }
 
 static int page_referenced_anon(struct page *page,
-                                struct mem_cgroup *mem_cont,
+                                struct mem_cgroup *memcg,
                                 unsigned long *vm_flags)
 {
         unsigned int mapcount;
@@ -796,7 +796,7 @@ static int page_referenced_anon(struct page *page,
                  * counting on behalf of references from different
                  * cgroups
                  */
-                if (mem_cont && !mm_match_cgroup(vma->vm_mm, mem_cont))
+                if (memcg && !mm_match_cgroup(vma->vm_mm, memcg))
                         continue;
                 referenced += page_referenced_one(page, vma, address,
                                                   &mapcount, vm_flags);
@@ -811,7 +811,7 @@ static int page_referenced_anon(struct page *page,
 /**
  * page_referenced_file - referenced check for object-based rmap
  * @page: the page we're checking references on.
- * @mem_cont: target memory controller
+ * @memcg: target memory control group
  * @vm_flags: collect encountered vma->vm_flags who actually referenced the page
  *
  * For an object-based mapped page, find all the places it is mapped and
@@ -822,7 +822,7 @@ static int page_referenced_anon(struct page *page,
  * This function is only called from page_referenced for object-based pages.
  */
 static int page_referenced_file(struct page *page,
-                                struct mem_cgroup *mem_cont,
+                                struct mem_cgroup *memcg,
                                 unsigned long *vm_flags)
 {
         unsigned int mapcount;
@@ -864,7 +864,7 @@ static int page_referenced_file(struct page *page,
                  * counting on behalf of references from different
                  * cgroups
                  */
-                if (mem_cont && !mm_match_cgroup(vma->vm_mm, mem_cont))
+                if (memcg && !mm_match_cgroup(vma->vm_mm, memcg))
                         continue;
                 referenced += page_referenced_one(page, vma, address,
                                                   &mapcount, vm_flags);
@@ -880,7 +880,7 @@ static int page_referenced_file(struct page *page,
  * page_referenced - test if the page was referenced
  * @page: the page to test
  * @is_locked: caller holds lock on the page
- * @mem_cont: target memory controller
+ * @memcg: target memory cgroup
  * @vm_flags: collect encountered vma->vm_flags who actually referenced the page
  *
  * Quick test_and_clear_referenced for all mappings to a page,
@@ -888,7 +888,7 @@ static int page_referenced_file(struct page *page,
  */
 int page_referenced(struct page *page,
                     int is_locked,
-                    struct mem_cgroup *mem_cont,
+                    struct mem_cgroup *memcg,
                     unsigned long *vm_flags)
 {
         int referenced = 0;
@@ -904,13 +904,13 @@ int page_referenced(struct page *page,
                         }
                 }
                 if (unlikely(PageKsm(page)))
-                        referenced += page_referenced_ksm(page, mem_cont,
+                        referenced += page_referenced_ksm(page, memcg,
                                                                 vm_flags);
                 else if (PageAnon(page))
-                        referenced += page_referenced_anon(page, mem_cont,
+                        referenced += page_referenced_anon(page, memcg,
                                                                 vm_flags);
                 else if (page->mapping)
-                        referenced += page_referenced_file(page, mem_cont,
+                        referenced += page_referenced_file(page, memcg,
                                                                 vm_flags);
                 if (we_locked)
                         unlock_page(page);