From b0f4311c3ebe928e4d4ba796cc338fb3021c4d85 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Thu, 1 Oct 2009 15:44:09 -0700 Subject: [PATCH] --- yaml --- r: 166649 b: refs/heads/master c: 3dece8347df6a16239fab10dadb370854f1c969c h: refs/heads/master i: 166647: 53885aeefb58b800bc08f9328afa995a6567330b v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e7ddfeb37d72..c07545e88deb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26251eaf98e26dc2ce2dc26d63bc502700760704 +refs/heads/master: 3dece8347df6a16239fab10dadb370854f1c969c diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index d2b88596efde..ca83b73fba19 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -3708,8 +3708,10 @@ static void check_for_release(struct cgroup *cgrp) void __css_put(struct cgroup_subsys_state *css) { struct cgroup *cgrp = css->cgroup; + int val; rcu_read_lock(); - if (atomic_dec_return(&css->refcnt) == 1) { + val = atomic_dec_return(&css->refcnt); + if (val == 1) { if (notify_on_release(cgrp)) { set_bit(CGRP_RELEASABLE, &cgrp->flags); check_for_release(cgrp); @@ -3717,6 +3719,7 @@ void __css_put(struct cgroup_subsys_state *css) cgroup_wakeup_rmdir_waiter(cgrp); } rcu_read_unlock(); + WARN_ON_ONCE(val < 1); } /*