memcg: enum lru_list lru (f156ab93) · Commits · 戴 / test

mm/memcontrol.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -719,14 +719,14 @@ mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
		unsigned int lru_mask)
		{
		struct mem_cgroup_per_zone *mz;
		enum lru_list l;
		enum lru_list lru;
		unsigned long ret = 0;

		mz = mem_cgroup_zoneinfo(memcg, nid, zid);

		for_each_lru(l) {
		if (BIT(l) & lru_mask)
		ret += mz->lru_size[l];
		for_each_lru(lru) {
		if (BIT(lru) & lru_mask)
		ret += mz->lru_size[lru];
		}
		return ret;
		}
		@@ -3701,10 +3701,10 @@ move_account:
		mem_cgroup_start_move(memcg);
		for_each_node_state(node, N_HIGH_MEMORY) {
		for (zid = 0; !ret && zid < MAX_NR_ZONES; zid++) {
		enum lru_list l;
		for_each_lru(l) {
		enum lru_list lru;
		for_each_lru(lru) {
		ret = mem_cgroup_force_empty_list(memcg,
		node, zid, l);
		node, zid, lru);
		if (ret)
		break;
		}
		@@ -4734,7 +4734,7 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)
		{
		struct mem_cgroup_per_node *pn;
		struct mem_cgroup_per_zone *mz;
		enum lru_list l;
		enum lru_list lru;
		int zone, tmp = node;
		/*
		* This routine is called against possible nodes.
		@@ -4752,8 +4752,8 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)

		for (zone = 0; zone < MAX_NR_ZONES; zone++) {
		mz = &pn->zoneinfo[zone];
		for_each_lru(l)
		INIT_LIST_HEAD(&mz->lruvec.lists[l]);
		for_each_lru(lru)
		INIT_LIST_HEAD(&mz->lruvec.lists[lru]);
		mz->usage_in_excess = 0;
		mz->on_tree = false;
		mz->memcg = memcg;