From 6db4cd8eff2e3e079812c7d873aa56f328df9c4b Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Mon, 8 Oct 2012 16:34:12 -0700 Subject: [PATCH] --- yaml --- r: 332479 b: refs/heads/master c: 587af308cc30ec6b94bde9aeb322e85fe4363e32 h: refs/heads/master i: 332477: e667abcab98d3f4bf66d3f23195e8a4d66cb6c25 332475: 04e6a6f955f4bdd16c49cdf0bfe7cf5eb9618095 332471: f8939cf603d68e9a23e623edf5ede20758051884 332463: f021cc1e94c74ae8b0d02b319640b106b9b911f9 332447: b87d1276adc45d0b333d2a6fe30641973e4e3978 332415: b8a675aa1d30f2a6df6e3297bfa2e7d87ac2271b v: v3 --- [refs] | 2 +- trunk/include/linux/memcontrol.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 44a838127c39..b8e976753498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7795912c257bc068445f1db429c94d6b4b6ee604 +refs/heads/master: 587af308cc30ec6b94bde9aeb322e85fe4363e32 diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h index 8d9489fdab2e..fd0e6d53836e 100644 --- a/trunk/include/linux/memcontrol.h +++ b/trunk/include/linux/memcontrol.h @@ -84,14 +84,14 @@ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); static inline -int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) +bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) { - struct mem_cgroup *memcg; - int match; + struct mem_cgroup *task_memcg; + bool match; rcu_read_lock(); - memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner)); - match = __mem_cgroup_same_or_subtree(cgroup, memcg); + task_memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); + match = __mem_cgroup_same_or_subtree(memcg, task_memcg); rcu_read_unlock(); return match; } @@ -258,10 +258,10 @@ static inline struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm return NULL; } -static inline int mm_match_cgroup(struct mm_struct *mm, +static inline bool mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *memcg) { - return 1; + return true; } static inline int task_in_mem_cgroup(struct task_struct *task,