[SCSI] osst: fix if (...) \n #if... cases missing semicolons when false

[linux-2.6-omap-h63xx.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 23620d52cf373520dee84ada4891afe596064d55..304b5410d746ec724afcb4e3ce50bfe65f1bf2ff 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -152,8 +152,7 @@ asmlinkage long sys_setpriority(int which, int who, int niceval)
        switch (which) {
                case PRIO_PROCESS:
                        if (who)
-                               p = find_task_by_pid_ns(who,
-                                               current->nsproxy->pid_ns);
+                               p = find_task_by_vpid(who);
                        else
                                p = current;
                        if (p)
@@ -210,8 +209,7 @@ asmlinkage long sys_getpriority(int which, int who)
        switch (which) {
                case PRIO_PROCESS:
                        if (who)
-                               p = find_task_by_pid_ns(who,
-                                               current->nsproxy->pid_ns);
+                               p = find_task_by_vpid(who);
                        else
                                p = current;
                        if (p) {
@@ -979,7 +977,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
                detach_pid(p, PIDTYPE_PGID);
                pid = find_vpid(pgid);
                attach_pid(p, PIDTYPE_PGID, pid);
-               p->signal->pgrp = pid_nr(pid);
+               set_task_pgrp(p, pid_nr(pid));
        }
 
        err = 0;
@@ -1067,7 +1065,8 @@ asmlinkage long sys_setsid(void)
         * 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))
+       if (session > 1 && find_task_by_pid_type_ns(PIDTYPE_PGID,
+                               session, &init_pid_ns))
                goto out;
 
        group_leader->signal->leader = 1;