Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123242
b: refs/heads/master
c: 8187926
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Ingo Molnar committed Dec 12, 2008
1 parent b4924b3 commit 11b7ade
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 899921025b406a71a8aeb2d7855658ea0cf0ed23
refs/heads/master: 8187926bdae98648db24db3391c4efd21ec669b1
8 changes: 3 additions & 5 deletions trunk/fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,6 @@ static int de_thread(struct task_struct *tsk)
struct signal_struct *sig = tsk->signal;
struct sighand_struct *oldsighand = tsk->sighand;
spinlock_t *lock = &oldsighand->siglock;
struct task_struct *leader = NULL;
int count;

if (thread_group_empty(tsk))
Expand Down Expand Up @@ -810,7 +809,7 @@ static int de_thread(struct task_struct *tsk)
* and to assume its PID:
*/
if (!thread_group_leader(tsk)) {
leader = tsk->group_leader;
struct task_struct *leader = tsk->group_leader;

sig->notify_count = -1; /* for exit_notify() */
for (;;) {
Expand Down Expand Up @@ -862,8 +861,9 @@ static int de_thread(struct task_struct *tsk)

BUG_ON(leader->exit_state != EXIT_ZOMBIE);
leader->exit_state = EXIT_DEAD;

write_unlock_irq(&tasklist_lock);

release_task(leader);
}

sig->group_exit_task = NULL;
Expand All @@ -872,8 +872,6 @@ static int de_thread(struct task_struct *tsk)
no_thread_group:
exit_itimers(sig);
flush_itimer_signals();
if (leader)
release_task(leader);

if (atomic_read(&oldsighand->count) != 1) {
struct sighand_struct *newsighand;
Expand Down

0 comments on commit 11b7ade

Please sign in to comment.