lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched: Move sched_autogroup_exit() to free_signal_struct()

Browse Source 
Per Oleg's suggestion, undo fork failure free/put_signal_struct change,
and move sched_autogroup_exit() to free_signal_struct() instead.

Signed-off-by: Mike Galbraith <efault@gmx.de>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294222564.8369.6.camel@marge.simson.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Mike Galbraith
2011-01-05 11:16:04 +01:00
committed by Ingo Molnar
parent e9aa1dd19f
commit 1c5354de90
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/fork.c
View File

@@ -169,15 +169,14 @@ EXPORT_SYMBOL(free_task);
static inline void free_signal_struct(struct signal_struct *sig) static inline void free_signal_struct(struct signal_struct *sig)
{ {
taskstats_tgid_free(sig); taskstats_tgid_free(sig);
sched_autogroup_exit(sig);
kmem_cache_free(signal_cachep, sig); kmem_cache_free(signal_cachep, sig);
} }
static inline void put_signal_struct(struct signal_struct *sig) static inline void put_signal_struct(struct signal_struct *sig)
{ {
if (atomic_dec_and_test(&sig->sigcnt)) { if (atomic_dec_and_test(&sig->sigcnt))
sched_autogroup_exit(sig);
free_signal_struct(sig); free_signal_struct(sig);
}
} }
void __put_task_struct(struct task_struct *tsk) void __put_task_struct(struct task_struct *tsk)
@@ -1318,7 +1317,7 @@ bad_fork_cleanup_mm:
} }
bad_fork_cleanup_signal: bad_fork_cleanup_signal:
if (!(clone_flags & CLONE_THREAD)) if (!(clone_flags & CLONE_THREAD))
put_signal_struct(p->signal); free_signal_struct(p->signal);
bad_fork_cleanup_sighand: bad_fork_cleanup_sighand:
__cleanup_sighand(p->sighand); __cleanup_sighand(p->sighand);
bad_fork_cleanup_fs: bad_fork_cleanup_fs: