3 files changed, 1 insertions, 40 deletions

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index a9806bc21ec3..39f3d6519035 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -555,41 +555,6 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
         return 0;
 }
 
-/*
- * Kill an inode that got unregistered..
- */
-static void proc_kill_inodes(struct proc_dir_entry *de)
-{
-        struct list_head *p;
-        struct super_block *sb;
-
-        /*
-         * Actually it's a partial revoke().
-         */
-        spin_lock(&sb_lock);
-        list_for_each_entry(sb, &proc_fs_type.fs_supers, s_instances) {
-                file_list_lock();
-                list_for_each(p, &sb->s_files) {
-                        struct file *filp = list_entry(p, struct file,
-                                                        f_u.fu_list);
-                        struct dentry *dentry = filp->f_path.dentry;
-                        struct inode *inode;
-                        const struct file_operations *fops;
-
-                        if (dentry->d_op != &proc_dentry_operations)
-                                continue;
-                        inode = dentry->d_inode;
-                        if (PDE(inode) != de)
-                                continue;
-                        fops = filp->f_op;
-                        filp->f_op = NULL;
-                        fops_put(fops);
-                }
-                file_list_unlock();
-        }
-        spin_unlock(&sb_lock);
-}
-
 static struct proc_dir_entry *proc_create(struct proc_dir_entry **parent,
                                           const char *name,
                                           mode_t mode,
@@ -764,8 +729,6 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
 continue_removing:
                 if (S_ISDIR(de->mode))
                         parent->nlink--;
-                if (!S_ISREG(de->mode))
-                        proc_kill_inodes(de);
                 de->nlink = 0;
                 WARN_ON(de->subdir);
                 if (!atomic_read(&de->count))
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 1b2b6c6bb475..1820eb2ef762 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -78,5 +78,3 @@ static inline int proc_fd(struct inode *inode)
 {
         return PROC_I(inode)->fd;
 }
-
-extern struct file_system_type proc_fs_type;
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 1f86bb860e04..ec9cb3b6c93b 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -98,7 +98,7 @@ static void proc_kill_sb(struct super_block *sb)
         put_pid_ns(ns);
 }
 
-struct file_system_type proc_fs_type = {
+static struct file_system_type proc_fs_type = {
         .name           = "proc",
         .get_sb         = proc_get_sb,
         .kill_sb        = proc_kill_sb,