Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / net / bluetooth / af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 5355df63d39b673d246d131564a1e17dc116c27d..d3ee69b35a78267f35b8ea4a9b32d367160eea21 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -641,7 +641,7 @@ int bt_procfs_init(struct module* module, struct net *net, const char *name,
        sk_list->fops.llseek    = seq_lseek;
        sk_list->fops.release   = seq_release_private;
 
-       pde = proc_net_fops_create(net, name, 0, &sk_list->fops);
+       pde = proc_create(name, 0, net->proc_net, &sk_list->fops);
        if (!pde)
                return -ENOMEM;
 
@@ -652,7 +652,7 @@ int bt_procfs_init(struct module* module, struct net *net, const char *name,
 
 void bt_procfs_cleanup(struct net *net, const char *name)
 {
-       proc_net_remove(net, name);
+       remove_proc_entry(name, net->proc_net);
 }
 #else
 int bt_procfs_init(struct module* module, struct net *net, const char *name,