aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-02-08 18:00:43 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 18:33:32 -0500
commitb55fcb22d445a7460cbbc138ceae096d5617715a (patch)
tree0b4ef31edaec10ad8b87a36b66a853e5d0020675
parent0cf975e16927fd70f34cee20d3856246c13bb4c8 (diff)
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>
-rw-r--r--fs/proc/base.c12
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,
2102 int buflen) 2102 int buflen)
2103{ 2103{
2104 struct pid_namespace *ns = dentry->d_sb->s_fs_info; 2104 struct pid_namespace *ns = dentry->d_sb->s_fs_info;
2105 pid_t pid = task_pid_nr_ns(current, ns); 2105 pid_t tgid = task_tgid_nr_ns(current, ns);
2106 char tmp[PROC_NUMBUF]; 2106 char tmp[PROC_NUMBUF];
2107 if (!pid) 2107 if (!tgid)
2108 return -ENOENT; 2108 return -ENOENT;
2109 sprintf(tmp, "%d", pid); 2109 sprintf(tmp, "%d", tgid);
2110 return vfs_readlink(dentry,buffer,buflen,tmp); 2110 return vfs_readlink(dentry,buffer,buflen,tmp);
2111} 2111}
2112 2112
2113static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd) 2113static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
2114{ 2114{
2115 struct pid_namespace *ns = dentry->d_sb->s_fs_info; 2115 struct pid_namespace *ns = dentry->d_sb->s_fs_info;
2116 pid_t pid = task_pid_nr_ns(current, ns); 2116 pid_t tgid = task_tgid_nr_ns(current, ns);
2117 char tmp[PROC_NUMBUF]; 2117 char tmp[PROC_NUMBUF];
2118 if (!pid) 2118 if (!tgid)
2119 return ERR_PTR(-ENOENT); 2119 return ERR_PTR(-ENOENT);
2120 sprintf(tmp, "%d", pid); 2120 sprintf(tmp, "%d", task_tgid_nr_ns(current, ns));
2121 return ERR_PTR(vfs_follow_link(nd,tmp)); 2121 return ERR_PTR(vfs_follow_link(nd,tmp));
2122} 2122}
2123 2123