mm/memcg: kill mem_cgroup_lru_del()

This patch kills mem_cgroup_lru_del(), we can use
mem_cgroup_lru_del_list() instead.  On 0-order isolation we already have
right lru list id.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 95dc32c9b5548994f6201d816116fd6746965bfb..58d820c2b9fc2effeb0c77119fd37eefd39428fa 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -66,7 +66,6 @@ struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *);
 struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *,
                                       enum lru_list);
 void mem_cgroup_lru_del_list(struct page *, enum lru_list);
-void mem_cgroup_lru_del(struct page *);
 struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *,
                                         enum lru_list, enum lru_list);
 
@@ -260,10 +259,6 @@ static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru)
 {
 }
 
-static inline void mem_cgroup_lru_del(struct page *page)
-{
-}
-
 static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone,
                                                       struct page *page,
                                                       enum lru_list from,

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2350ae7bad89e880c8dd6d5933ed87c06f2e3e71..bae7575f980edcfb215778444412584959bd8271 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1115,11 +1115,6 @@ void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru)
        mz->lru_size[lru] -= 1 << compound_order(page);
 }
 
-void mem_cgroup_lru_del(struct page *page)
-{
-       mem_cgroup_lru_del_list(page, page_lru(page));
-}
-
 /**
  * mem_cgroup_lru_move_lists - account for moving a page between lrus
  * @zone: zone of the page

diff --git a/mm/vmscan.c b/mm/vmscan.c
index ff5052066f8cbd318304463fc18bef0bcc0eff6f..ec38e5692f34d9100069de25d31cf2f2fa5d1769 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1147,7 +1147,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
 
                switch (__isolate_lru_page(page, mode)) {
                case 0:
-                       mem_cgroup_lru_del(page);
+                       mem_cgroup_lru_del_list(page, lru);
                        list_move(&page->lru, dst);
                        nr_taken += hpage_nr_pages(page);
                        break;
@@ -1205,8 +1205,11 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
 
                        if (__isolate_lru_page(cursor_page, mode) == 0) {
                                unsigned int isolated_pages;
+                               enum lru_list cursor_lru;
 
-                               mem_cgroup_lru_del(cursor_page);
+                               cursor_lru = page_lru(cursor_page);
+                               mem_cgroup_lru_del_list(cursor_page,
+                                                       cursor_lru);
                                list_move(&cursor_page->lru, dst);
                                isolated_pages = hpage_nr_pages(cursor_page);
                                nr_taken += isolated_pages;