powerpc: 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>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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>

3 files changed, 7 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index a3fd56b186e6..6f544ba4b37f 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -1259,14 +1259,8 @@ static const struct file_operations proc_eeh_operations = {
 
 static int __init eeh_init_proc(void)
 {
-        struct proc_dir_entry *e;
-
-        if (machine_is(pseries)) {
-                e = create_proc_entry("ppc64/eeh", 0, NULL);
-                if (e)
-                        e->proc_fops = &proc_eeh_operations;
-        }
-
+        if (machine_is(pseries))
+                proc_create("ppc64/eeh", 0, NULL, &proc_eeh_operations);
         return 0;
 }
 __initcall(eeh_init_proc);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index ac75c10de278..75769aae41d5 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -512,12 +512,9 @@ static int proc_ppc64_create_ofdt(void)
         if (!machine_is(pseries))
                 return 0;
 
-        ent = create_proc_entry("ppc64/ofdt", S_IWUSR, NULL);
-        if (ent) {
-                ent->data = NULL;
+        ent = proc_create("ppc64/ofdt", S_IWUSR, NULL, &ofdt_fops);
+        if (ent)
                 ent->size = 0;
-                ent->proc_fops = &ofdt_fops;
-        }
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index befadd4f9524..7d3e2b0bd4d2 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -468,10 +468,9 @@ static int __init rtas_init(void)
                 return -ENOMEM;
         }
 
-        entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_rtas_log_operations;
-        else
+        entry = proc_create("ppc64/rtas/error_log", S_IRUSR, NULL,
+                            &proc_rtas_log_operations);
+        if (!entry)
                 printk(KERN_ERR "Failed to create error_log proc entry\n");
 
         if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)