aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-12-12 21:12:21 -0500
committerTejun Heo <tj@kernel.org>2011-12-12 21:12:21 -0500
commit257058ae2b971646b96ab3a15605ac69186e562a (patch)
treeb8a462e64c4bb4b43dcc6c9d05b194f9c747c91d /include/linux/sched.h
parente25e2cbb4c6679bed5f52fb0f2cc381688297901 (diff)
threadgroup: rename signal->threadgroup_fork_lock to ->group_rwsem
Make the following renames to prepare for extension of threadgroup locking. * s/signal->threadgroup_fork_lock/signal->group_rwsem/ * s/threadgroup_fork_read_lock()/threadgroup_change_begin()/ * s/threadgroup_fork_read_unlock()/threadgroup_change_end()/ * s/threadgroup_fork_write_lock()/threadgroup_lock()/ * s/threadgroup_fork_write_unlock()/threadgroup_unlock()/ This patch doesn't cause any behavior change. -v2: Rename threadgroup_change_done() to threadgroup_change_end() per KAMEZAWA's suggestion. Signed-off-by: Tejun Heo <tj@kernel.org> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Paul Menage <paul@paulmenage.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d81cce933869..8cd523202a3b 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -635,13 +635,13 @@ struct signal_struct {
635#endif 635#endif
636#ifdef CONFIG_CGROUPS 636#ifdef CONFIG_CGROUPS
637 /* 637 /*
638 * The threadgroup_fork_lock prevents threads from forking with 638 * The group_rwsem prevents threads from forking with
639 * CLONE_THREAD while held for writing. Use this for fork-sensitive 639 * CLONE_THREAD while held for writing. Use this for fork-sensitive
640 * threadgroup-wide operations. It's taken for reading in fork.c in 640 * threadgroup-wide operations. It's taken for reading in fork.c in
641 * copy_process(). 641 * copy_process().
642 * Currently only needed write-side by cgroups. 642 * Currently only needed write-side by cgroups.
643 */ 643 */
644 struct rw_semaphore threadgroup_fork_lock; 644 struct rw_semaphore group_rwsem;
645#endif 645#endif
646 646
647 int oom_adj; /* OOM kill score adjustment (bit shift) */ 647 int oom_adj; /* OOM kill score adjustment (bit shift) */
@@ -2371,29 +2371,29 @@ static inline void unlock_task_sighand(struct task_struct *tsk,
2371 spin_unlock_irqrestore(&tsk->sighand->siglock, *flags); 2371 spin_unlock_irqrestore(&tsk->sighand->siglock, *flags);
2372} 2372}
2373 2373
2374/* See the declaration of threadgroup_fork_lock in signal_struct. */ 2374/* See the declaration of group_rwsem in signal_struct. */
2375#ifdef CONFIG_CGROUPS 2375#ifdef CONFIG_CGROUPS
2376static inline void threadgroup_fork_read_lock(struct task_struct *tsk) 2376static inline void threadgroup_change_begin(struct task_struct *tsk)
2377{ 2377{
2378 down_read(&tsk->signal->threadgroup_fork_lock); 2378 down_read(&tsk->signal->group_rwsem);
2379} 2379}
2380static inline void threadgroup_fork_read_unlock(struct task_struct *tsk) 2380static inline void threadgroup_change_end(struct task_struct *tsk)
2381{ 2381{
2382 up_read(&tsk->signal->threadgroup_fork_lock); 2382 up_read(&tsk->signal->group_rwsem);
2383} 2383}
2384static inline void threadgroup_fork_write_lock(struct task_struct *tsk) 2384static inline void threadgroup_lock(struct task_struct *tsk)
2385{ 2385{
2386 down_write(&tsk->signal->threadgroup_fork_lock); 2386 down_write(&tsk->signal->group_rwsem);
2387} 2387}
2388static inline void threadgroup_fork_write_unlock(struct task_struct *tsk) 2388static inline void threadgroup_unlock(struct task_struct *tsk)
2389{ 2389{
2390 up_write(&tsk->signal->threadgroup_fork_lock); 2390 up_write(&tsk->signal->group_rwsem);
2391} 2391}
2392#else 2392#else
2393static inline void threadgroup_fork_read_lock(struct task_struct *tsk) {} 2393static inline void threadgroup_change_begin(struct task_struct *tsk) {}
2394static inline void threadgroup_fork_read_unlock(struct task_struct *tsk) {} 2394static inline void threadgroup_change_end(struct task_struct *tsk) {}
2395static inline void threadgroup_fork_write_lock(struct task_struct *tsk) {} 2395static inline void threadgroup_lock(struct task_struct *tsk) {}
2396static inline void threadgroup_fork_write_unlock(struct task_struct *tsk) {} 2396static inline void threadgroup_unlock(struct task_struct *tsk) {}
2397#endif 2397#endif
2398 2398
2399#ifndef __HAVE_THREAD_FUNCTIONS 2399#ifndef __HAVE_THREAD_FUNCTIONS