|
@@ -815,11 +815,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
|
|
|
{
|
|
|
struct signal_struct *sig;
|
|
|
|
|
|
- if (clone_flags & CLONE_THREAD) {
|
|
|
- atomic_inc(¤t->signal->count);
|
|
|
- atomic_inc(¤t->signal->live);
|
|
|
+ if (clone_flags & CLONE_THREAD)
|
|
|
return 0;
|
|
|
- }
|
|
|
|
|
|
sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
|
|
|
tsk->signal = sig;
|
|
@@ -877,16 +874,6 @@ void __cleanup_signal(struct signal_struct *sig)
|
|
|
kmem_cache_free(signal_cachep, sig);
|
|
|
}
|
|
|
|
|
|
-static void cleanup_signal(struct task_struct *tsk)
|
|
|
-{
|
|
|
- struct signal_struct *sig = tsk->signal;
|
|
|
-
|
|
|
- atomic_dec(&sig->live);
|
|
|
-
|
|
|
- if (atomic_dec_and_test(&sig->count))
|
|
|
- __cleanup_signal(sig);
|
|
|
-}
|
|
|
-
|
|
|
static void copy_flags(unsigned long clone_flags, struct task_struct *p)
|
|
|
{
|
|
|
unsigned long new_flags = p->flags;
|
|
@@ -1239,6 +1226,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
|
|
|
}
|
|
|
|
|
|
if (clone_flags & CLONE_THREAD) {
|
|
|
+ atomic_inc(¤t->signal->count);
|
|
|
+ atomic_inc(¤t->signal->live);
|
|
|
p->group_leader = current->group_leader;
|
|
|
list_add_tail_rcu(&p->thread_group, &p->group_leader->thread_group);
|
|
|
}
|
|
@@ -1282,7 +1271,8 @@ bad_fork_cleanup_mm:
|
|
|
if (p->mm)
|
|
|
mmput(p->mm);
|
|
|
bad_fork_cleanup_signal:
|
|
|
- cleanup_signal(p);
|
|
|
+ if (!(clone_flags & CLONE_THREAD))
|
|
|
+ __cleanup_signal(p->signal);
|
|
|
bad_fork_cleanup_sighand:
|
|
|
__cleanup_sighand(p->sighand);
|
|
|
bad_fork_cleanup_fs:
|