diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2016-12-12 19:45:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 21:55:09 -0500 |
commit | 39a10ac23cfdb6469550e1641a2bc2ed80663ceb (patch) | |
tree | f3c7aa72dd5966dfb6c43fe563b092e9b453647d | |
parent | f5887c71cf682a6c27e26cb83296d49729f62b3c (diff) |
proc: kmalloc struct pde_opener
kzalloc is too much, half of the fields will be reinitialized anyway.
If proc file doesn't have ->release hook (some still do not), clearing
is unnecessary because it will be freed immediately.
Link: http://lkml.kernel.org/r/20161029155747.GC1246@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/proc/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index f623a3ca2746..57f548e2eb59 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
@@ -321,7 +321,7 @@ static int proc_reg_open(struct inode *inode, struct file *file) | |||
321 | * by hand in remove_proc_entry(). For this, save opener's credentials | 321 | * by hand in remove_proc_entry(). For this, save opener's credentials |
322 | * for later. | 322 | * for later. |
323 | */ | 323 | */ |
324 | pdeo = kzalloc(sizeof(struct pde_opener), GFP_KERNEL); | 324 | pdeo = kmalloc(sizeof(struct pde_opener), GFP_KERNEL); |
325 | if (!pdeo) | 325 | if (!pdeo) |
326 | return -ENOMEM; | 326 | return -ENOMEM; |
327 | 327 | ||
@@ -338,6 +338,8 @@ static int proc_reg_open(struct inode *inode, struct file *file) | |||
338 | if (rv == 0 && release) { | 338 | if (rv == 0 && release) { |
339 | /* To know what to release. */ | 339 | /* To know what to release. */ |
340 | pdeo->file = file; | 340 | pdeo->file = file; |
341 | pdeo->closing = false; | ||
342 | pdeo->c = NULL; | ||
341 | /* Strictly for "too late" ->release in proc_reg_release(). */ | 343 | /* Strictly for "too late" ->release in proc_reg_release(). */ |
342 | spin_lock(&pde->pde_unload_lock); | 344 | spin_lock(&pde->pde_unload_lock); |
343 | list_add(&pdeo->lh, &pde->pde_openers); | 345 | list_add(&pdeo->lh, &pde->pde_openers); |