commit 5634708b5fce807bdf2091cfafc2fb24d791f0c8
author Eric W. Biederman <ebiederm@xmission.com> Mon Jun 26 00:25:40 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Jun 26 09:58:23 2006 -0700
tree dc383be7cd284c9364d90147bdea981b3d9cb5d4
parent f05e15b59467d97c30fbffed80db9e00b73d640b

[PATCH] proc: Fix the .. inode number on /proc/<pid>/fd

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fs/proc/base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index c4a1ff3..13e3ab9 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1196,7 +1196,8 @@
 
 static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
 {
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct dentry *dentry = filp->f_dentry;
+	struct inode *inode = dentry->d_inode;
 	struct task_struct *p = proc_task(inode);
 	unsigned int fd, tid, ino;
 	int retval;
@@ -1217,7 +1218,7 @@
 				goto out;
 			filp->f_pos++;
 		case 1:
-			ino = fake_ino(tid, PROC_TID_INO);
+			ino = parent_ino(dentry);
 			if (filldir(dirent, "..", 2, 1, ino, DT_DIR) < 0)
 				goto out;
 			filp->f_pos++;