From 52d129679c617d41ffa8131fb192d28315cfd65e Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 26 Jun 2006 00:25:40 -0700
Subject: [PATCH] --- yaml --- r: 30236 b: refs/heads/master c:
 5634708b5fce807bdf2091cfafc2fb24d791f0c8 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 461f1e6c8447..2d481b07d653 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f05e15b59467d97c30fbffed80db9e00b73d640b
+refs/heads/master: 5634708b5fce807bdf2091cfafc2fb24d791f0c8
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index c4a1ff371b8d..13e3ab99eb74 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -1196,7 +1196,8 @@ static struct inode_operations proc_pid_link_inode_operations = {
 
 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 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
 				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++;