@@ -1026,8 +1026,8 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
{
struct mem_cgroup_reclaim_iter *iter;
struct cgroup_subsys_state *css;
- struct mem_cgroup *memcg = NULL;
- struct mem_cgroup *pos = NULL;
+ struct mem_cgroup *pos;
+ struct mem_cgroup *next = NULL;
if (mem_cgroup_disabled())
return NULL;
@@ -1039,10 +1039,9 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
restart:
if (reclaim) {
int gen;
- struct mem_cgroup_per_node *mz;
+ int nid = reclaim->pgdat->node_id;
- mz = root->nodeinfo[reclaim->pgdat->node_id];
- iter = &mz->iter;
+ iter = &root->nodeinfo[nid]->iter;
gen = atomic_read(&iter->generation);
/*
@@ -1055,29 +1054,22 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
goto out_unlock;
pos = rcu_dereference(iter->position);
- } else if (prev) {
+ } else
pos = prev;
- }
css = pos ? &pos->css : NULL;
- for (;;) {
- css = css_next_descendant_pre(css, &root->css);
- if (!css) {
- break;
- }
-
+ while ((css = css_next_descendant_pre(css, &root->css))) {
/*
* Verify the css and acquire a reference. The root
* is provided by the caller, so we know it's alive
* and kicking, and don't take an extra reference.
*/
- if (css == &root->css || css_tryget(css)) {
+ if (css == &root->css || css_tryget(css))
break;
- }
}
- memcg = mem_cgroup_from_css(css);
+ next = mem_cgroup_from_css(css);
if (reclaim) {
/*
@@ -1085,13 +1077,13 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
* thread, so check that the value hasn't changed since we read
* it to avoid reclaiming from the same cgroup twice.
*/
- if (cmpxchg(&iter->position, pos, memcg) != pos) {
+ if (cmpxchg(&iter->position, pos, next) != pos) {
if (css && css != &root->css)
css_put(css);
goto restart;
}
- if (!memcg) {
+ if (!next) {
atomic_inc(&iter->generation);
/*
@@ -1110,7 +1102,7 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
if (prev && prev != root)
css_put(&prev->css);
- return memcg;
+ return next;
}
/**
A clean up to make variable names more clear and to improve code readability. No functional change. Signed-off-by: Kinsey Ho <kinseyho@google.com> --- mm/memcontrol.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)