cgroups: documentation updates

- remove 'releasable' since it has been moved to the debug subsys.
- update lock requirements of subsys callbacks.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index d9014aa0eb68b469836b29afe932532b168a63ee..60287e9e9d2788e5af69678e8673bf4568e38056 100644 (file)
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -227,7 +227,6 @@ Each cgroup is represented by a directory in the cgroup file system
 containing the following files describing that cgroup:
 
  - tasks: list of tasks (by pid) attached to that cgroup
 containing the following files describing that cgroup:
 
  - tasks: list of tasks (by pid) attached to that cgroup

- - releasable flag: cgroup currently removeable?

  - notify_on_release flag: run the release agent on exit?
  - release_agent: the path to use for release notifications (this file
    exists in the top cgroup only)
  - notify_on_release flag: run the release agent on exit?
  - release_agent: the path to use for release notifications (this file
    exists in the top cgroup only)


@@ -360,7 +359,7 @@ Now you want to do something with this cgroup.
 
 In this directory you can find several files:
 # ls
 
 In this directory you can find several files:
 # ls

-notify_on_release releasable tasks
+notify_on_release tasks

 (plus whatever files added by the attached subsystems)
 
 Now attach your shell to this cgroup:
 (plus whatever files added by the attached subsystems)
 
 Now attach your shell to this cgroup:


@@ -479,7 +478,6 @@ newly-created cgroup if an error occurs after this subsystem's
 create() method has been called for the new cgroup).
 
 void pre_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp);
 create() method has been called for the new cgroup).
 
 void pre_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp);

-(cgroup_mutex held by caller)

 
 Called before checking the reference count on each subsystem. This may
 be useful for subsystems which have some extra references even if
 
 Called before checking the reference count on each subsystem. This may
 be useful for subsystems which have some extra references even if


@@ -498,6 +496,7 @@ remain valid while the caller holds cgroup_mutex.
 
 void attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
            struct cgroup *old_cgrp, struct task_struct *task)
 
 void attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
            struct cgroup *old_cgrp, struct task_struct *task)

+(cgroup_mutex held by caller)

 
 Called after the task has been attached to the cgroup, to allow any
 post-attachment activity that requires memory allocations or blocking.
 
 Called after the task has been attached to the cgroup, to allow any
 post-attachment activity that requires memory allocations or blocking.


@@ -511,6 +510,7 @@ void exit(struct cgroup_subsys *ss, struct task_struct *task)
 Called during task exit.
 
 int populate(struct cgroup_subsys *ss, struct cgroup *cgrp)
 Called during task exit.
 
 int populate(struct cgroup_subsys *ss, struct cgroup *cgrp)

+(cgroup_mutex held by caller)

 
 Called after creation of a cgroup to allow a subsystem to populate
 the cgroup directory with file entries.  The subsystem should make
 
 Called after creation of a cgroup to allow a subsystem to populate
 the cgroup directory with file entries.  The subsystem should make


@@ -520,6 +520,7 @@ method can return an error code, the error code is currently not
 always handled well.
 
 void post_clone(struct cgroup_subsys *ss, struct cgroup *cgrp)
 always handled well.
 
 void post_clone(struct cgroup_subsys *ss, struct cgroup *cgrp)

+(cgroup_mutex held by caller)

 
 Called at the end of cgroup_clone() to do any paramater
 initialization which might be required before a task could attach.  For
 
 Called at the end of cgroup_clone() to do any paramater
 initialization which might be required before a task could attach.  For