Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c392b8c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul E. McKenney
Browse files

cgroups: __rcu annotations 



Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarPaul Menage <menage@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 67bdbffd

include/linux/cgroup.h

+2 −2
Original line number Diff line number Diff line
@@ -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];

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,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

kernel/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

	 */