Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / fs / proc / generic.c

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 75e08d36b2f1141c28e7dd730e00afa5f21bcdba..a2596afffae6dad430f8cb2727628e162c567876 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -165,7 +165,7 @@ void proc_free_inum(unsigned int inum)
 
 static void *proc_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-       nd_set_link(nd, PDE_DATA(dentry->d_inode));
+       nd_set_link(nd, __PDE_DATA(dentry->d_inode));
        return NULL;
 }
 
@@ -624,3 +624,16 @@ void *proc_get_parent_data(const struct inode *inode)
        return de->parent->data;
 }
 EXPORT_SYMBOL_GPL(proc_get_parent_data);
+
+void proc_remove(struct proc_dir_entry *de)
+{
+       if (de)
+               remove_proc_subtree(de->name, de->parent);
+}
+EXPORT_SYMBOL(proc_remove);
+
+void *PDE_DATA(const struct inode *inode)
+{
+       return __PDE_DATA(inode);
+}
+EXPORT_SYMBOL(PDE_DATA);