From 5f0e4d6fe037b20f6ad982a1db60e4c403c7d440 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sat, 10 Jul 2010 15:23:34 -0700
Subject: [PATCH] --- yaml --- r: 346305 b: refs/heads/master c:
 ae06c7c83fc6e97ba247a261921c101960f3d28f h: refs/heads/master i:   346303:
 b5eb86d7bd1a1728ca5d744a5d5b78438f31c061 v: v3

---
 [refs]               |  2 +-
 trunk/fs/proc/base.c | 11 +----------
 trunk/fs/proc/root.c |  8 --------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 2af72e87b78b..f54cc07bf739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e656d8a6f7fdf7612d2f5771f0ddfca9487f59d9
+refs/heads/master: ae06c7c83fc6e97ba247a261921c101960f3d28f
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index cbe454e94af8..6177fc238fdb 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -2714,19 +2714,12 @@ static int fake_filldir(void *buf, const char *name, int namelen,
 /* for the /proc/ directory itself, after non-process stuff has been done */
 int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
 {
-	unsigned int nr;
-	struct task_struct *reaper;
 	struct tgid_iter iter;
 	struct pid_namespace *ns;
 	filldir_t __filldir;
 
 	if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET)
-		goto out_no_task;
-	nr = filp->f_pos - FIRST_PROCESS_ENTRY;
-
-	reaper = get_proc_task(filp->f_path.dentry->d_inode);
-	if (!reaper)
-		goto out_no_task;
+		goto out;
 
 	ns = filp->f_dentry->d_sb->s_fs_info;
 	iter.task = NULL;
@@ -2747,8 +2740,6 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
 	}
 	filp->f_pos = PID_MAX_LIMIT + TGID_OFFSET;
 out:
-	put_task_struct(reaper);
-out_no_task:
 	return 0;
 }
 
diff --git a/trunk/fs/proc/root.c b/trunk/fs/proc/root.c
index 5da984959edc..13ef6247e7a3 100644
--- a/trunk/fs/proc/root.c
+++ b/trunk/fs/proc/root.c
@@ -100,7 +100,6 @@ static struct dentry *proc_mount(struct file_system_type *fs_type,
 	int err;
 	struct super_block *sb;
 	struct pid_namespace *ns;
-	struct proc_inode *ei;
 	char *options;
 
 	if (flags & MS_KERNMOUNT) {
@@ -130,13 +129,6 @@ static struct dentry *proc_mount(struct file_system_type *fs_type,
 		sb->s_flags |= MS_ACTIVE;
 	}
 
-	ei = PROC_I(sb->s_root->d_inode);
-	if (!ei->pid) {
-		rcu_read_lock();
-		ei->pid = get_pid(find_pid_ns(1, ns));
-		rcu_read_unlock();
-	}
-
 	return dget(sb->s_root);
 }