proc: Supply a function to remove a proc entry by PDE

Supply a function (proc_remove()) to remove a proc entry (and any subtree
rooted there) by proc_dir_entry pointer rather than by name and (optionally)
root dir entry pointer.  This allows us to eliminate all remaining pde->name
accesses outside of procfs.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Grant Likely <grant.likely@linaro.or>
cc: linux-acpi@vger.kernel.org
cc: openipmi-developer@lists.sourceforge.net
cc: devicetree-discuss@lists.ozlabs.org
cc: linux-pci@vger.kernel.org
cc: netdev@vger.kernel.org
cc: netfilter-devel@vger.kernel.org
cc: alsa-devel@alsa-project.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 7 insertions, 15 deletions

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 959ddbb0ca4d..1d0e89213a28 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -184,14 +184,9 @@ int vlan_proc_add_dev(struct net_device *vlandev)
  */
 int vlan_proc_rem_dev(struct net_device *vlandev)
 {
-        struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
-
         /** NOTE:  This will consume the memory pointed to by dent, it seems. */
-        if (vlan_dev_priv(vlandev)->dent) {
-                remove_proc_entry(vlan_dev_priv(vlandev)->dent->name,
-                                  vn->proc_vlan_dir);
-                vlan_dev_priv(vlandev)->dent = NULL;
-        }
+        proc_remove(vlan_dev_priv(vlandev)->dent);
+        vlan_dev_priv(vlandev)->dent = NULL;
         return 0;
 }
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index f6af4fe59f2e..6c41e979dc88 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1904,7 +1904,7 @@ static void pktgen_change_name(const struct pktgen_net *pn, struct net_device *d
                         if (pkt_dev->odev != dev)
                                 continue;
 
-                        remove_proc_entry(pkt_dev->entry->name, pn->proc_dir);
+                        proc_remove(pkt_dev->entry);
 
                         pkt_dev->entry = proc_create_data(dev->name, 0600,
                                                           pn->proc_dir,
@@ -3576,8 +3576,6 @@ static void _rem_dev_from_if_list(struct pktgen_thread *t,
 static int pktgen_remove_device(struct pktgen_thread *t,
                                 struct pktgen_dev *pkt_dev)
 {
-        struct pktgen_net *pn = t->net;
-
         pr_debug("remove_device pkt_dev=%p\n", pkt_dev);
 
         if (pkt_dev->running) {
@@ -3597,7 +3595,7 @@ static int pktgen_remove_device(struct pktgen_thread *t,
         _rem_dev_from_if_list(t, pkt_dev);
 
         if (pkt_dev->entry)
-                remove_proc_entry(pkt_dev->entry->name, pn->proc_dir);
+                proc_remove(pkt_dev->entry);
 
 #ifdef CONFIG_XFRM
         free_SAs(pkt_dev);
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index e4738fef070a..0b732efd32e2 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -105,7 +105,7 @@ clusterip_config_entry_put(struct clusterip_config *c)
                  * functions are also incrementing the refcount on their own,
                  * so it's safe to remove the entry even if it's in use. */
 #ifdef CONFIG_PROC_FS
-                remove_proc_entry(c->pde->name, c->pde->parent);
+                proc_remove(c->pde);
 #endif
                 return;
         }
@@ -736,7 +736,7 @@ static void __exit clusterip_tg_exit(void)
 {
         pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION);
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent);
+        proc_remove(clusterip_procdir);
 #endif
         nf_unregister_hook(&cip_arp_ops);
         xt_unregister_target(&clusterip_tg_reg);
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 7ea6e180139c..537d9ee7209f 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -287,8 +287,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
                 return -ENOENT;
         if (!idev->stats.proc_dir_entry)
                 return -EINVAL;
-        remove_proc_entry(idev->stats.proc_dir_entry->name,
-                          net->mib.proc_net_devsnmp6);
+        proc_remove(idev->stats.proc_dir_entry);
         idev->stats.proc_dir_entry = NULL;
         return 0;
 }