diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2008-02-08 07:19:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:28 -0500 |
commit | f374ada53bd1ca7c16d7607369fccc6769704956 (patch) | |
tree | b790eca5876c05e8f987b3e84333c9b92cc1482d /arch | |
parent | 69440e76f6121fe7a5193a82f45ccec08e4bb24b (diff) |
pid: fix solaris_procids
Use task_pgrp_vnr not task_pgrp_nr so we return the process id the processes
pid namespace and not in the initial pid namespace.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/solaris/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c index c86cb3091a8e..d3e48e9701bf 100644 --- a/arch/sparc64/solaris/misc.c +++ b/arch/sparc64/solaris/misc.c | |||
@@ -415,7 +415,7 @@ asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid) | |||
415 | 415 | ||
416 | switch (cmd) { | 416 | switch (cmd) { |
417 | case 0: /* getpgrp */ | 417 | case 0: /* getpgrp */ |
418 | return task_pgrp_nr(current); | 418 | return task_pgrp_vnr(current); |
419 | case 1: /* setpgrp */ | 419 | case 1: /* setpgrp */ |
420 | { | 420 | { |
421 | int (*sys_setpgid)(pid_t,pid_t) = | 421 | int (*sys_setpgid)(pid_t,pid_t) = |
@@ -426,7 +426,7 @@ asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid) | |||
426 | ret = sys_setpgid(0, 0); | 426 | ret = sys_setpgid(0, 0); |
427 | if (ret) return ret; | 427 | if (ret) return ret; |
428 | proc_clear_tty(current); | 428 | proc_clear_tty(current); |
429 | return task_pgrp_nr(current); | 429 | return task_pgrp_vnr(current); |
430 | } | 430 | } |
431 | case 2: /* getsid */ | 431 | case 2: /* getsid */ |
432 | { | 432 | { |