aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-07-13 17:23:27 -0700
committerColin Cross <ccross@android.com>2011-07-13 17:23:27 -0700
commit5fc5470c62dfd3fd5b1252049a9eca8ca12cab42 (patch)
treed79fe4bbf9bc4db2fc8c7480a201ad95214b25e5 /Documentation
parente6841f6354bcd4f59d433f1d392b4c768594af05 (diff)
parentf558e1e53997b661e85de0ba96c2596c9cc97b4f (diff)
downloadkernel_samsung_espresso10-5fc5470c62dfd3fd5b1252049a9eca8ca12cab42.zip
kernel_samsung_espresso10-5fc5470c62dfd3fd5b1252049a9eca8ca12cab42.tar.gz
kernel_samsung_espresso10-5fc5470c62dfd3fd5b1252049a9eca8ca12cab42.tar.bz2
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cgroups/cgroups.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index cd67e90..60d82e1 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -593,6 +593,15 @@ there are not tasks in the cgroup. If pre_destroy() returns error code,
rmdir() will fail with it. From this behavior, pre_destroy() can be
called multiple times against a cgroup.
+int allow_attach(struct cgroup *cgrp, struct task_struct *task)
+(cgroup_mutex held by caller)
+
+Called prior to moving a task into a cgroup; if the subsystem
+returns an error, this will abort the attach operation. Used
+to extend the permission checks - if all subsystems in a cgroup
+return 0, the attach will be allowed to proceed, even if the
+default permission check (root or same user) fails.
+
int can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
struct task_struct *task)
(cgroup_mutex held by caller)