From: Andrew Morton Date: Fri, 21 Sep 2012 01:03:26 +0000 (+1000) Subject: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix X-Git-Tag: next-20120924~6^2~31 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34ddf38cd2f3a80c8d0093e8a586756dbf0affc2;p=karo-tx-linux.git proc-use-kzalloc-instead-of-kmalloc-and-memset-fix fix __proc_create() coding-style issues, remove unneeded zero-initialisations Cc: yan Signed-off-by: Andrew Morton --- diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 38de015c0690..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; @@ -617,18 +618,17 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent, len = strlen(fn); ent = kzalloc(sizeof(struct proc_dir_entry) + len + 1, GFP_KERNEL); - if (!ent) goto out; + if (!ent) + goto out; 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; }