Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 0a8d6ebd9b45063ab32eba86e905b29148031ef5..4c6bdf97a6577d190332b85654769a92ce553111 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -171,7 +171,7 @@ static __init int dccpprobe_init(void)
        spin_lock_init(&dccpw.lock);
        if (kfifo_alloc(&dccpw.fifo, bufsize, GFP_KERNEL))
                return ret;
-       if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
+       if (!proc_create(procname, S_IRUSR, init_net.proc_net, &dccpprobe_fops))
                goto err0;
 
        ret = setup_jprobe();
@@ -181,7 +181,7 @@ static __init int dccpprobe_init(void)
        pr_info("DCCP watch registered (port=%d)\n", port);
        return 0;
 err1:
-       proc_net_remove(&init_net, procname);
+       remove_proc_entry(procname, init_net.proc_net);
 err0:
        kfifo_free(&dccpw.fifo);
        return ret;
@@ -191,7 +191,7 @@ module_init(dccpprobe_init);
 static __exit void dccpprobe_exit(void)
 {
        kfifo_free(&dccpw.fifo);
-       proc_net_remove(&init_net, procname);
+       remove_proc_entry(procname, init_net.proc_net);
        unregister_jprobe(&dccp_send_probe);
 
 }