[PATCH] sata_mv: endian annotations

[safe/jmp/linux-2.6] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 84371fd..0b6ec0e 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1206,7 +1206,7 @@ asmlinkage long sys_times(struct tms __user * tbuf)
                struct task_struct *t;
                cputime_t utime, stime, cutime, cstime;
 
-               read_lock(&tasklist_lock);
+               spin_lock_irq(&tsk->sighand->siglock);
                utime = tsk->signal->utime;
                stime = tsk->signal->stime;
                t = tsk;
@@ -1216,20 +1216,9 @@ asmlinkage long sys_times(struct tms __user * tbuf)
                        t = next_thread(t);
                } while (t != tsk);
 
-               /*
-                * While we have tasklist_lock read-locked, no dying thread
-                * can be updating current->signal->[us]time.  Instead,
-                * we got their counts included in the live thread loop.
-                * However, another thread can come in right now and
-                * do a wait call that updates current->signal->c[us]time.
-                * To make sure we always see that pair updated atomically,
-                * we take the siglock around fetching them.
-                */
-               spin_lock_irq(&tsk->sighand->siglock);
                cutime = tsk->signal->cutime;
                cstime = tsk->signal->cstime;
                spin_unlock_irq(&tsk->sighand->siglock);
-               read_unlock(&tasklist_lock);
 
                tmp.tms_utime = cputime_to_clock_t(utime);
                tmp.tms_stime = cputime_to_clock_t(stime);
@@ -1383,18 +1372,29 @@ asmlinkage long sys_getsid(pid_t pid)
 asmlinkage long sys_setsid(void)
 {
        struct task_struct *group_leader = current->group_leader;
-       struct pid *pid;
+       pid_t session;
        int err = -EPERM;
 
        mutex_lock(&tty_mutex);
        write_lock_irq(&tasklist_lock);
 
-       pid = find_pid(PIDTYPE_PGID, group_leader->pid);
-       if (pid)
+       /* Fail if I am already a session leader */
+       if (group_leader->signal->leader)
+               goto out;
+
+       session = group_leader->pid;
+       /* Fail if a process group id already exists that equals the
+        * proposed session id.
+        *
+        * Don't check if session id == 1 because kernel threads use this
+        * session id and so the check will always fail and make it so
+        * init cannot successfully call setsid.
+        */
+       if (session > 1 && find_task_by_pid_type(PIDTYPE_PGID, session))
                goto out;
 
        group_leader->signal->leader = 1;
-       __set_special_pids(group_leader->pid, group_leader->pid);
+       __set_special_pids(session, session);
        group_leader->signal->tty = NULL;
        group_leader->signal->tty_old_pgrp = 0;
        err = process_group(group_leader);