diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-08 15:00:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 15:33:32 -0800 |
| commit | b55fcb22d445a7460cbbc138ceae096d5617715a (patch) | |
| tree | 0b4ef31edaec10ad8b87a36b66a853e5d0020675 /fs | |
| parent | 0cf975e16927fd70f34cee20d3856246c13bb4c8 (diff) | |
| download | talos-op-linux-b55fcb22d445a7460cbbc138ceae096d5617715a.tar.gz talos-op-linux-b55fcb22d445a7460cbbc138ceae096d5617715a.zip | |
revert "proc: fix the threaded proc self"
Revert commit c6caeb7c4544608e8ae62731334661fc396c7f85 ("proc: fix the
threaded /proc/self"), since Eric says "The patch really is wrong.
There is at least one corner case in procps that cares."
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Guillaume Chazarain" <guichaz@yahoo.fr>
Cc: "Pavel Emelyanov" <xemul@openvz.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/base.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index a0c4ba6c6e57..7c6b4ec83cb7 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2102,22 +2102,22 @@ static int proc_self_readlink(struct dentry *dentry, char __user *buffer, int buflen) { struct pid_namespace *ns = dentry->d_sb->s_fs_info; - pid_t pid = task_pid_nr_ns(current, ns); + pid_t tgid = task_tgid_nr_ns(current, ns); char tmp[PROC_NUMBUF]; - if (!pid) + if (!tgid) return -ENOENT; - sprintf(tmp, "%d", pid); + sprintf(tmp, "%d", tgid); return vfs_readlink(dentry,buffer,buflen,tmp); } static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd) { struct pid_namespace *ns = dentry->d_sb->s_fs_info; - pid_t pid = task_pid_nr_ns(current, ns); + pid_t tgid = task_tgid_nr_ns(current, ns); char tmp[PROC_NUMBUF]; - if (!pid) + if (!tgid) return ERR_PTR(-ENOENT); - sprintf(tmp, "%d", pid); + sprintf(tmp, "%d", task_tgid_nr_ns(current, ns)); return ERR_PTR(vfs_follow_link(nd,tmp)); } |
