isdn: use non-racy method for proc entries creation

Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.

Add correct ->owner to proc_fops to fix reading/module unloading race.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Karsten Keil <kkeil@suse.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 4fd4c46892e3..8b256a617c8a 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -288,13 +288,12 @@ divert_dev_init(void)
         isdn_proc_entry = proc_mkdir("isdn", init_net.proc_net);
         if (!isdn_proc_entry)
                 return (-1);
-        isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry);
+        isdn_divert_entry = proc_create("divert", S_IFREG | S_IRUGO,
+                                        isdn_proc_entry, &isdn_fops);
         if (!isdn_divert_entry) {
                 remove_proc_entry("isdn", init_net.proc_net);
                 return (-1);
         }
-        isdn_divert_entry->proc_fops = &isdn_fops; 
-        isdn_divert_entry->owner = THIS_MODULE; 
 #endif  /* CONFIG_PROC_FS */
 
         return (0);