unexport __set_special_pids()

PATCH New Oleg Nesterov 1 participant 1 message Jun 10, 2013 Scheduler

lore

Share & tools

lore

Oleg Nesterov

author

2013-06-10 14:10 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Oleg Nesterov <[email protected]>

---
 include/linux/sched.h |    2 --
 kernel/exit.c         |   11 -----------
 kernel/sys.c          |   13 ++++++++++++-
 3 files changed, 12 insertions(+), 14 deletions(-)

include/linux/sched.h +0 -2

index ce51dfd..253cb37 100644
@@ -1955,8 +1955,6 @@ extern struct task_struct *find_task_by_vpid(pid_t nr);
 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
 		struct pid_namespace *ns);
 
-extern void __set_special_pids(struct pid *pid);
-
 /* per-UID process charging. */
 extern struct user_struct * alloc_uid(kuid_t);
 static inline struct user_struct *get_uid(struct user_struct *u)

kernel/exit.c +0 ~~-11~~

index af2eb3c..0ae87b5 100644
@@ -312,17 +312,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.

kernel/sys.c +12 -1

index b95d3c7..50f8677 100644
@@ -1286,6 +1286,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;

@@ -1305,7 +1316,7 @@ SYSCALL_DEFINE0(setsid)
 		goto out;
 
 	group_leader->signal->leader = 1;
-	__set_special_pids(sid);
+	set_special_pids(sid);
 
 	proc_clear_tty(group_leader);

Signature · 1 line

1.5.5.1