lkml.org 
[lkml]   [2010]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC tip/core/rcu 04/30] cgroups: __rcu annotations
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Acked-by: Paul Menage <menage@google.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    ---
    include/linux/cgroup.h | 4 ++--
    include/linux/sched.h | 2 +-
    kernel/cgroup.c | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
    index e3d00fd..1e7ce60 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 */
    @@ -205,7 +205,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];
    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index f118809..97fc7ee 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -1427,7 +1427,7 @@ struct task_struct {
    #endif
    #ifdef CONFIG_CGROUPS
    /* Control Group info protected by css_set_lock */
    - struct css_set *cgroups;
    + struct css_set __rcu *cgroups;
    /* cg_list protected by css_set_lock and tsk->alloc_lock */
    struct list_head cg_list;
    #endif
    diff --git a/kernel/cgroup.c b/kernel/cgroup.c
    index 3ac6f5b..30c459b 100644
    --- a/kernel/cgroup.c
    +++ b/kernel/cgroup.c
    @@ -138,7 +138,7 @@ struct css_id {
    * is called after synchronize_rcu(). But for safe use, css_is_removed()
    * css_tryget() should be used for avoiding race.
    */
    - struct cgroup_subsys_state *css;
    + struct cgroup_subsys_state __rcu *css;
    /*
    * ID of this css.
    */
    --
    1.7.0.6


    \
     
     \ /
      Last update: 2010-07-14 22:13    [W:0.021 / U:119.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site