[Devel] - rename-attach_pid-to-find_attach_pid.patch removed from -mm tree

[akpm at osdl.org]

The patch titled
     Rename attach_pid() to find_attach_pid()
has been removed from the -mm tree.  Its filename was
     rename-attach_pid-to-find_attach_pid.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------
Subject: Rename attach_pid() to find_attach_pid()
From: Sukadev Bhattiprolu <sukadev at us.ibm.com>

attach_pid() currently takes a pid_t parameter and uses find_pid() to find the
struct pid associated with the pid_t.  With containers, we sometimes already
have the struct pid and could skip the find_pid() - if we have a version of
attach_pid() that takes a struct pid parameter.

This patch renames the attach_pid() to find_attach_pid().  My next patch
defines attach_pid() to take a struct pid.

Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Dave Hansen <haveblue at us.ibm.com>
Cc: Serge Hallyn <serue at us.ibm.com>
Cc: <containers at lists.osdl.org>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 fs/exec.c           |    2 +-
 include/linux/pid.h |    4 ++--
 kernel/exit.c       |    4 ++--
 kernel/fork.c       |    6 +++---
 kernel/pid.c        |    3 ++-
 kernel/sys.c        |    2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff -puN fs/exec.c~rename-attach_pid-to-find_attach_pid fs/exec.c
--- a/fs/exec.c~rename-attach_pid-to-find_attach_pid
+++ a/fs/exec.c
@@ -701,7 +701,7 @@ static int de_thread(struct task_struct 
 		 */
 		detach_pid(tsk, PIDTYPE_PID);
 		tsk->pid = leader->pid;
-		attach_pid(tsk, PIDTYPE_PID,  tsk->pid);
+		find_attach_pid(tsk, PIDTYPE_PID,  tsk->pid);
 		transfer_pid(leader, tsk, PIDTYPE_PGID);
 		transfer_pid(leader, tsk, PIDTYPE_SID);
 		list_replace_rcu(&leader->tasks, &tsk->tasks);
diff -puN include/linux/pid.h~rename-attach_pid-to-find_attach_pid include/linux/pid.h
--- a/include/linux/pid.h~rename-attach_pid-to-find_attach_pid
+++ a/include/linux/pid.h
@@ -72,10 +72,10 @@ extern struct task_struct *FASTCALL(get_
 extern struct pid *get_task_pid(struct task_struct *task, enum pid_type type);
 
 /*
- * attach_pid() and detach_pid() must be called with the tasklist_lock
+ * find_attach_pid() and detach_pid() must be called with the tasklist_lock
  * write-held.
  */
-extern int FASTCALL(attach_pid(struct task_struct *task,
+extern int FASTCALL(find_attach_pid(struct task_struct *task,
 				enum pid_type type, int nr));
 
 extern void FASTCALL(detach_pid(struct task_struct *task, enum pid_type));
diff -puN kernel/exit.c~rename-attach_pid-to-find_attach_pid kernel/exit.c
--- a/kernel/exit.c~rename-attach_pid-to-find_attach_pid
+++ a/kernel/exit.c
@@ -300,12 +300,12 @@ void __set_special_pids(pid_t session, p
 	if (process_session(curr) != session) {
 		detach_pid(curr, PIDTYPE_SID);
 		set_signal_session(curr->signal, session);
-		attach_pid(curr, PIDTYPE_SID, session);
+		find_attach_pid(curr, PIDTYPE_SID, session);
 	}
 	if (process_group(curr) != pgrp) {
 		detach_pid(curr, PIDTYPE_PGID);
 		curr->signal->pgrp = pgrp;
-		attach_pid(curr, PIDTYPE_PGID, pgrp);
+		find_attach_pid(curr, PIDTYPE_PGID, pgrp);
 	}
 }
 
diff -puN kernel/fork.c~rename-attach_pid-to-find_attach_pid kernel/fork.c
--- a/kernel/fork.c~rename-attach_pid-to-find_attach_pid
+++ a/kernel/fork.c
@@ -1246,13 +1246,13 @@ static struct task_struct *copy_process(
 			p->signal->tty = current->signal->tty;
 			p->signal->pgrp = process_group(current);
 			set_signal_session(p->signal, process_session(current));
-			attach_pid(p, PIDTYPE_PGID, process_group(p));
-			attach_pid(p, PIDTYPE_SID, process_session(p));
+			find_attach_pid(p, PIDTYPE_PGID, process_group(p));
+			find_attach_pid(p, PIDTYPE_SID, process_session(p));
 
 			list_add_tail_rcu(&p->tasks, &init_task.tasks);
 			__get_cpu_var(process_counts)++;
 		}
-		attach_pid(p, PIDTYPE_PID, p->pid);
+		find_attach_pid(p, PIDTYPE_PID, p->pid);
 		nr_threads++;
 	}
 
diff -puN kernel/pid.c~rename-attach_pid-to-find_attach_pid kernel/pid.c
--- a/kernel/pid.c~rename-attach_pid-to-find_attach_pid
+++ a/kernel/pid.c
@@ -247,7 +247,8 @@ struct pid * fastcall find_pid(int nr)
 }
 EXPORT_SYMBOL_GPL(find_pid);
 
-int fastcall attach_pid(struct task_struct *task, enum pid_type type, int nr)
+int fastcall find_attach_pid(struct task_struct *task, enum pid_type type,
+				int nr)
 {
 	struct pid_link *link;
 	struct pid *pid;
diff -puN kernel/sys.c~rename-attach_pid-to-find_attach_pid kernel/sys.c
--- a/kernel/sys.c~rename-attach_pid-to-find_attach_pid
+++ a/kernel/sys.c
@@ -1487,7 +1487,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
 	if (process_group(p) != pgid) {
 		detach_pid(p, PIDTYPE_PGID);
 		p->signal->pgrp = pgid;
-		attach_pid(p, PIDTYPE_PGID, pgid);
+		find_attach_pid(p, PIDTYPE_PGID, pgid);
 	}
 
 	err = 0;
_

Patches currently in -mm which might be from sukadev at us.ibm.com are

rename-attach_pid-to-find_attach_pid.patch
attach_pid-with-struct-pid-parameter.patch
remove-find_attach_pid.patch
statically-initialize-struct-pid-for-swapper.patch
explicitly-set-pgid-sid-of-init.patch

_______________________________________________
Containers mailing list
Containers at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/containers