[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20070313044455.GD8884@us.ibm.com>
Date: Mon, 12 Mar 2007 21:44:55 -0700
From: sukadev@...ibm.com
To: Andrew Morton <akpm@...l.org>
Cc: Cedric Le Goater <clg@...ibm.com>,
Dave Hansen <haveblue@...ibm.com>,
Serge Hallyn <serue@...ibm.com>,
Eric Biederman <ebiederm@...ssion.com>,
Herbert Poetzl <herbert@...hfloor.at>,
containers@...ts.osdl.org, linux-kernel@...r.kernel.org
Subject: [PATCH 4/5] Remove the likely(pid) check in copy_process
From: Sukadev Bhattiprolu <sukadev@...ibm.com>
Subject: [PATCH 4/5] Remove the likely(pid) check in copy_process
Now that we pass in a struct pid parameter to copy_process()
and even the swapper (pid_t == 0) has a valid struct pid,
we no longer need this check.
Changelog:
Per Eric Biederman's comments, moved this out to a separate
patch for easier review.
Signed-off-by: Sukadev Bhattiprolu <sukadev@...ibm.com>
Cc: Cedric Le Goater <clg@...ibm.com>
Cc: Dave Hansen <haveblue@...ibm.com>
Cc: Serge Hallyn <serue@...ibm.com>
Cc: containers@...ts.osdl.org
Acked-by: Eric W. Biederman <ebiederm@...ssion.com>
---
kernel/fork.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
Index: lx26-20-mm2c/kernel/fork.c
===================================================================
--- lx26-20-mm2c.orig/kernel/fork.c 2007-02-28 15:08:46.000000000 -0800
+++ lx26-20-mm2c/kernel/fork.c 2007-02-28 15:33:20.000000000 -0800
@@ -1249,26 +1249,24 @@ static struct task_struct *copy_process(
}
}
- if (likely(p->pid)) {
- add_parent(p);
- tracehook_init_task(p);
-
- if (thread_group_leader(p)) {
- pid_t pgid = process_group(current);
- pid_t sid = process_session(current);
-
- p->signal->tty = current->signal->tty;
- p->signal->pgrp = pgid;
- set_signal_session(p->signal, process_session(current));
- attach_pid(p, PIDTYPE_PGID, find_pid(pgid));
- attach_pid(p, PIDTYPE_SID, find_pid(sid));
+ add_parent(p);
+ tracehook_init_task(p);
- list_add_tail_rcu(&p->tasks, &init_task.tasks);
- __get_cpu_var(process_counts)++;
- }
- attach_pid(p, PIDTYPE_PID, pid);
- nr_threads++;
+ if (thread_group_leader(p)) {
+ pid_t pgid = process_group(current);
+ pid_t sid = process_session(current);
+
+ p->signal->tty = current->signal->tty;
+ p->signal->pgrp = pgid;
+ set_signal_session(p->signal, process_session(current));
+ attach_pid(p, PIDTYPE_PGID, find_pid(pgid));
+ attach_pid(p, PIDTYPE_SID, find_pid(sid));
+
+ list_add_tail_rcu(&p->tasks, &init_task.tasks);
+ __get_cpu_var(process_counts)++;
}
+ attach_pid(p, PIDTYPE_PID, pid);
+ nr_threads++;
total_forks++;
spin_unlock(¤t->sighand->siglock);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists