Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[karo-tx-linux.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 3ac6f5b0a64b7448aceac7407c04cf7109f7ef5d..a8ce099544049e787464c3e4261ac70625cc0653 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1788,6 +1788,29 @@ out:
        return retval;
 }
 
+/**
+ * cgroup_attach_task_current_cg - attach task 'tsk' to current task's cgroup
+ * @tsk: the task to be attached
+ */
+int cgroup_attach_task_current_cg(struct task_struct *tsk)
+{
+       struct cgroupfs_root *root;
+       struct cgroup *cur_cg;
+       int retval = 0;
+
+       cgroup_lock();
+       for_each_active_root(root) {
+               cur_cg = task_cgroup_from_root(current, root);
+               retval = cgroup_attach_task(cur_cg, tsk);
+               if (retval)
+                       break;
+       }
+       cgroup_unlock();
+
+       return retval;
+}
+EXPORT_SYMBOL_GPL(cgroup_attach_task_current_cg);
+
 /*
  * Attach task with pid 'pid' to cgroup 'cgrp'. Call with cgroup_mutex
  * held. May take task_lock of task