Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186319
b: refs/heads/master
c: 5c99cbf
h: refs/heads/master
i:
  186317: 051bd88
  186315: f2de324
  186311: 86c4076
  186303: 4cc6a77
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 6, 2010
1 parent 5fbf72b commit 42dda32
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 30736a4d43f4af7f1a7836d6a266be17082195c4
refs/heads/master: 5c99cbf49a6e1a1efd25b11f4604c65c455e1612
8 changes: 4 additions & 4 deletions trunk/fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1561,12 +1561,13 @@ static int format_corename(char *corename, long signr)
return ispipe;
}

static int zap_process(struct task_struct *start)
static int zap_process(struct task_struct *start, int exit_code)
{
struct task_struct *t;
int nr = 0;

start->signal->flags = SIGNAL_GROUP_EXIT;
start->signal->group_exit_code = exit_code;
start->signal->group_stop_count = 0;

t = start;
Expand All @@ -1591,8 +1592,7 @@ static inline int zap_threads(struct task_struct *tsk, struct mm_struct *mm,
spin_lock_irq(&tsk->sighand->siglock);
if (!signal_group_exit(tsk->signal)) {
mm->core_state = core_state;
tsk->signal->group_exit_code = exit_code;
nr = zap_process(tsk);
nr = zap_process(tsk, exit_code);
}
spin_unlock_irq(&tsk->sighand->siglock);
if (unlikely(nr < 0))
Expand Down Expand Up @@ -1641,7 +1641,7 @@ static inline int zap_threads(struct task_struct *tsk, struct mm_struct *mm,
if (p->mm) {
if (unlikely(p->mm == mm)) {
lock_task_sighand(p, &flags);
nr += zap_process(p);
nr += zap_process(p, exit_code);
unlock_task_sighand(p, &flags);
}
break;
Expand Down

0 comments on commit 42dda32

Please sign in to comment.