nfsd4: set shorter timeout

[safe/jmp/linux-2.6] / kernel / cgroup_debug.c

diff --git a/kernel/cgroup_debug.c b/kernel/cgroup_debug.c
index c3dc3ab..0c92d79 100644 (file)
--- a/kernel/cgroup_debug.c
+++ b/kernel/cgroup_debug.c
@@ -40,9 +40,7 @@ static u64 taskcount_read(struct cgroup *cont, struct cftype *cft)
 {
        u64 count;
 
-       cgroup_lock();
        count = cgroup_task_count(cont);
-       cgroup_unlock();
        return count;
 }
 
@@ -57,7 +55,7 @@ static u64 current_css_set_refcount_read(struct cgroup *cont,
        u64 count;
 
        rcu_read_lock();
-       count = atomic_read(&current->cgroups->ref.refcount);
+       count = atomic_read(&current->cgroups->refcount);
        rcu_read_unlock();
        return count;
 }
@@ -90,7 +88,7 @@ static struct cftype files[] =  {
        {
                .name = "releasable",
                .read_u64 = releasable_read,
-       }
+       },
 };
 
 static int debug_populate(struct cgroup_subsys *ss, struct cgroup *cont)