Skip to content

Commit

Permalink
posix-timers: simplify de_thread()->exit_itimers() path
Browse files Browse the repository at this point in the history
Impact: simplify code

de_thread() postpones release_task(leader) until after exit_itimers().
This was needed because !SIGEV_THREAD_ID timers could use ->group_leader
without get_task_struct(). With the recent changes we can release the
leader earlier and simplify the code.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Oleg Nesterov authored and Ingo Molnar committed Dec 12, 2008
1 parent 8999210 commit 8187926
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions 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 8187926

Please sign in to comment.