1 files changed, 6 insertions, 7 deletions

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 9e8f63164309..0d80cef4cfb9 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -605,7 +605,8 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
         unsigned int len;
 
         /* make sure name is valid */
-        if (!name || !strlen(name)) goto out;
+        if (!name || !strlen(name))
+                goto out;
 
         if (xlate_proc_name(name, parent, &fn) != 0)
                 goto out;
@@ -616,20 +617,18 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
 
         len = strlen(fn);
 
-        ent = kmalloc(sizeof(struct proc_dir_entry) + len + 1, GFP_KERNEL);
-        if (!ent) goto out;
+        ent = kzalloc(sizeof(struct proc_dir_entry) + len + 1, GFP_KERNEL);
+        if (!ent)
+                goto out;
 
-        memset(ent, 0, sizeof(struct proc_dir_entry));
         memcpy(ent->name, fn, len + 1);
         ent->namelen = len;
         ent->mode = mode;
         ent->nlink = nlink;
         atomic_set(&ent->count, 1);
-        ent->pde_users = 0;
         spin_lock_init(&ent->pde_unload_lock);
-        ent->pde_unload_completion = NULL;
         INIT_LIST_HEAD(&ent->pde_openers);
- out:
+out:
         return ent;
 }