aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memcontrol.h1
-rw-r--r--mm/backing-dev.c4
-rw-r--r--mm/memcontrol.c5
3 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 891945507044..10d741e8fe51 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1097,7 +1097,6 @@ static inline void dec_lruvec_page_state(struct page *page,
1097 1097
1098#ifdef CONFIG_CGROUP_WRITEBACK 1098#ifdef CONFIG_CGROUP_WRITEBACK
1099 1099
1100struct list_head *mem_cgroup_cgwb_list(struct mem_cgroup *memcg);
1101struct wb_domain *mem_cgroup_wb_domain(struct bdi_writeback *wb); 1100struct wb_domain *mem_cgroup_wb_domain(struct bdi_writeback *wb);
1102void mem_cgroup_wb_stats(struct bdi_writeback *wb, unsigned long *pfilepages, 1101void mem_cgroup_wb_stats(struct bdi_writeback *wb, unsigned long *pfilepages,
1103 unsigned long *pheadroom, unsigned long *pdirty, 1102 unsigned long *pheadroom, unsigned long *pdirty,
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 8fe3ebd6ac00..347cc834c04a 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -557,7 +557,7 @@ static int cgwb_create(struct backing_dev_info *bdi,
557 memcg = mem_cgroup_from_css(memcg_css); 557 memcg = mem_cgroup_from_css(memcg_css);
558 blkcg_css = cgroup_get_e_css(memcg_css->cgroup, &io_cgrp_subsys); 558 blkcg_css = cgroup_get_e_css(memcg_css->cgroup, &io_cgrp_subsys);
559 blkcg = css_to_blkcg(blkcg_css); 559 blkcg = css_to_blkcg(blkcg_css);
560 memcg_cgwb_list = mem_cgroup_cgwb_list(memcg); 560 memcg_cgwb_list = &memcg->cgwb_list;
561 blkcg_cgwb_list = &blkcg->cgwb_list; 561 blkcg_cgwb_list = &blkcg->cgwb_list;
562 562
563 /* look up again under lock and discard on blkcg mismatch */ 563 /* look up again under lock and discard on blkcg mismatch */
@@ -736,7 +736,7 @@ static void cgwb_bdi_unregister(struct backing_dev_info *bdi)
736 */ 736 */
737void wb_memcg_offline(struct mem_cgroup *memcg) 737void wb_memcg_offline(struct mem_cgroup *memcg)
738{ 738{
739 struct list_head *memcg_cgwb_list = mem_cgroup_cgwb_list(memcg); 739 struct list_head *memcg_cgwb_list = &memcg->cgwb_list;
740 struct bdi_writeback *wb, *next; 740 struct bdi_writeback *wb, *next;
741 741
742 spin_lock_irq(&cgwb_lock); 742 spin_lock_irq(&cgwb_lock);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8bab4660e6aa..2751259f0a76 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3562,11 +3562,6 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css,
3562 3562
3563#ifdef CONFIG_CGROUP_WRITEBACK 3563#ifdef CONFIG_CGROUP_WRITEBACK
3564 3564
3565struct list_head *mem_cgroup_cgwb_list(struct mem_cgroup *memcg)
3566{
3567 return &memcg->cgwb_list;
3568}
3569
3570static int memcg_wb_domain_init(struct mem_cgroup *memcg, gfp_t gfp) 3565static int memcg_wb_domain_init(struct mem_cgroup *memcg, gfp_t gfp)
3571{ 3566{
3572 return wb_domain_init(&memcg->cgwb_domain, gfp); 3567 return wb_domain_init(&memcg->cgwb_domain, gfp);