procfs directory entry cleanup

Function proc_register() will assign proc_dir_operations and
proc_dir_inode_operations to ent's members proc_fops and proc_iops
correctly if ent is a directory. So the early assignment isn't
necessary.

Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 7 insertions, 13 deletions

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 4f8e53568b22..b5e7155d30d8 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -530,12 +530,6 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
                 return -EAGAIN;
         dp->low_ino = i;
 
-        spin_lock(&proc_subdir_lock);
-        dp->next = dir->subdir;
-        dp->parent = dir;
-        dir->subdir = dp;
-        spin_unlock(&proc_subdir_lock);
-
         if (S_ISDIR(dp->mode)) {
                 if (dp->proc_iops == NULL) {
                         dp->proc_fops = &proc_dir_operations;
@@ -551,6 +545,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
                 if (dp->proc_iops == NULL)
                         dp->proc_iops = &proc_file_inode_operations;
         }
+
+        spin_lock(&proc_subdir_lock);
+        dp->next = dir->subdir;
+        dp->parent = dir;
+        dir->subdir = dp;
+        spin_unlock(&proc_subdir_lock);
+
         return 0;
 }
 
@@ -653,9 +654,6 @@ struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
 
         ent = proc_create(&parent, name, S_IFDIR | mode, 2);
         if (ent) {
-                ent->proc_fops = &proc_dir_operations;
-                ent->proc_iops = &proc_dir_inode_operations;
-
                 if (proc_register(parent, ent) < 0) {
                         kfree(ent);
                         ent = NULL;
@@ -690,10 +688,6 @@ struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
 
         ent = proc_create(&parent,name,mode,nlink);
         if (ent) {
-                if (S_ISDIR(mode)) {
-                        ent->proc_fops = &proc_dir_operations;
-                        ent->proc_iops = &proc_dir_inode_operations;
-                }
                 if (proc_register(parent, ent) < 0) {
                         kfree(ent);
                         ent = NULL;