Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm: memcontrol: remove unnecessary memcg argument from soft limit functions

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Jianyu Zhan <nasa4836@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Johannes Weiner and committed by
Linus Torvalds
cf2c8127 e231875b

+14 -20
+14 -20
mm/memcontrol.c
··· 713 713 return &soft_limit_tree.rb_tree_per_node[nid]->rb_tree_per_zone[zid]; 714 714 } 715 715 716 - static void 717 - __mem_cgroup_insert_exceeded(struct mem_cgroup *memcg, 718 - struct mem_cgroup_per_zone *mz, 719 - struct mem_cgroup_tree_per_zone *mctz, 720 - unsigned long long new_usage_in_excess) 716 + static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_zone *mz, 717 + struct mem_cgroup_tree_per_zone *mctz, 718 + unsigned long long new_usage_in_excess) 721 719 { 722 720 struct rb_node **p = &mctz->rb_root.rb_node; 723 721 struct rb_node *parent = NULL; ··· 745 747 mz->on_tree = true; 746 748 } 747 749 748 - static void 749 - __mem_cgroup_remove_exceeded(struct mem_cgroup *memcg, 750 - struct mem_cgroup_per_zone *mz, 751 - struct mem_cgroup_tree_per_zone *mctz) 750 + static void __mem_cgroup_remove_exceeded(struct mem_cgroup_per_zone *mz, 751 + struct mem_cgroup_tree_per_zone *mctz) 752 752 { 753 753 if (!mz->on_tree) 754 754 return; ··· 754 758 mz->on_tree = false; 755 759 } 756 760 757 - static void 758 - mem_cgroup_remove_exceeded(struct mem_cgroup *memcg, 759 - struct mem_cgroup_per_zone *mz, 760 - struct mem_cgroup_tree_per_zone *mctz) 761 + static void mem_cgroup_remove_exceeded(struct mem_cgroup_per_zone *mz, 762 + struct mem_cgroup_tree_per_zone *mctz) 761 763 { 762 764 spin_lock(&mctz->lock); 763 - __mem_cgroup_remove_exceeded(memcg, mz, mctz); 765 + __mem_cgroup_remove_exceeded(mz, mctz); 764 766 spin_unlock(&mctz->lock); 765 767 } 766 768 ··· 785 791 spin_lock(&mctz->lock); 786 792 /* if on-tree, remove it */ 787 793 if (mz->on_tree) 788 - __mem_cgroup_remove_exceeded(memcg, mz, mctz); 794 + __mem_cgroup_remove_exceeded(mz, mctz); 789 795 /* 790 796 * Insert again. mz->usage_in_excess will be updated. 791 797 * If excess is 0, no tree ops. 792 798 */ 793 - __mem_cgroup_insert_exceeded(memcg, mz, mctz, excess); 799 + __mem_cgroup_insert_exceeded(mz, mctz, excess); 794 800 spin_unlock(&mctz->lock); 795 801 } 796 802 } ··· 806 812 for (zid = 0; zid < MAX_NR_ZONES; zid++) { 807 813 mz = &memcg->nodeinfo[nid]->zoneinfo[zid]; 808 814 mctz = soft_limit_tree_node_zone(nid, zid); 809 - mem_cgroup_remove_exceeded(memcg, mz, mctz); 815 + mem_cgroup_remove_exceeded(mz, mctz); 810 816 } 811 817 } 812 818 } ··· 829 835 * we will to add it back at the end of reclaim to its correct 830 836 * position in the tree. 831 837 */ 832 - __mem_cgroup_remove_exceeded(mz->memcg, mz, mctz); 838 + __mem_cgroup_remove_exceeded(mz, mctz); 833 839 if (!res_counter_soft_limit_excess(&mz->memcg->res) || 834 840 !css_tryget(&mz->memcg->css)) 835 841 goto retry; ··· 4580 4586 break; 4581 4587 } while (1); 4582 4588 } 4583 - __mem_cgroup_remove_exceeded(mz->memcg, mz, mctz); 4589 + __mem_cgroup_remove_exceeded(mz, mctz); 4584 4590 excess = res_counter_soft_limit_excess(&mz->memcg->res); 4585 4591 /* 4586 4592 * One school of thought says that we should not add ··· 4591 4597 * term TODO. 4592 4598 */ 4593 4599 /* If excess == 0, no tree ops */ 4594 - __mem_cgroup_insert_exceeded(mz->memcg, mz, mctz, excess); 4600 + __mem_cgroup_insert_exceeded(mz, mctz, excess); 4595 4601 spin_unlock(&mctz->lock); 4596 4602 css_put(&mz->memcg->css); 4597 4603 loop++;