diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2013-07-03 15:08:26 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 18:20:06 +0200 |
| commit | 7afcba40d52195dfb933ed9cdc16a1c2f712abf9 (patch) | |
| tree | 96c982555521309a1217920032b63313e9ebb5a1 /kernel | |
| parent | 9e6ce211671a60144aca34fcad1bbcb570f1f9ab (diff) | |
exit.c: unexport __set_special_pids()
Move __set_special_pids() from exit.c to sys.c close to its single caller
and make it static.
And rename it to set_special_pids(), another helper with this name has
gone away.
Change-Id: I0095999c845fabe07cdb3854c5ee1866220e3198
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 11 | ||||
| -rw-r--r-- | kernel/sys.c | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 699c3c41b..43786ecde 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -318,17 +318,6 @@ kill_orphaned_pgrp(struct task_struct *tsk, struct task_struct *parent) } } -void __set_special_pids(struct pid *pid) -{ - struct task_struct *curr = current->group_leader; - - if (task_session(curr) != pid) - change_pid(curr, PIDTYPE_SID, pid); - - if (task_pgrp(curr) != pid) - change_pid(curr, PIDTYPE_PGID, pid); -} - /* * Let kernel threads use this to say that they allow a certain signal. * Must not be used if kthread was cloned with CLONE_SIGHAND. diff --git a/kernel/sys.c b/kernel/sys.c index fdcbab92d..5eeaf2ca1 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1320,6 +1320,17 @@ out: return retval; } +static void set_special_pids(struct pid *pid) +{ + struct task_struct *curr = current->group_leader; + + if (task_session(curr) != pid) + change_pid(curr, PIDTYPE_SID, pid); + + if (task_pgrp(curr) != pid) + change_pid(curr, PIDTYPE_PGID, pid); +} + SYSCALL_DEFINE0(setsid) { struct task_struct *group_leader = current->group_leader; @@ -1339,7 +1350,7 @@ SYSCALL_DEFINE0(setsid) goto out; group_leader->signal->leader = 1; - __set_special_pids(sid); + set_special_pids(sid); proc_clear_tty(group_leader); |