1 files changed, 6 insertions, 2 deletions

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 0c991023ee47..ed4ba111bc8d 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -75,7 +75,7 @@ struct cgroup_subsys_state {
 
         unsigned long flags;
         /* ID for this css, if possible */
-        struct css_id *id;
+        struct css_id __rcu *id;
 };
 
 /* bits in struct cgroup_subsys_state flags field */
@@ -154,6 +154,10 @@ enum {
          * A thread in rmdir() is wating for this cgroup.
          */
         CGRP_WAIT_ON_RMDIR,
+        /*
+         * Clone cgroup values when creating a new child cgroup
+         */
+        CGRP_CLONE_CHILDREN,
 };
 
 /* which pidlist file are we talking about? */
@@ -205,7 +209,7 @@ struct cgroup {
         struct list_head children;      /* my children */
 
         struct cgroup *parent;          /* my parent */
-        struct dentry *dentry;          /* cgroup fs entry, RCU protected */
+        struct dentry __rcu *dentry;    /* cgroup fs entry, RCU protected */
 
         /* Private pointers for each registered subsystem */
         struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT];