aboutsummaryrefslogtreecommitdiffstats
path: root/fs/file_table.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/file_table.c')
-rw-r--r--fs/file_table.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 61517f57f8ef..2dc9f38bd195 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -201,11 +201,11 @@ static void __fput(struct file *file)
201 eventpoll_release(file); 201 eventpoll_release(file);
202 locks_remove_file(file); 202 locks_remove_file(file);
203 203
204 ima_file_free(file);
204 if (unlikely(file->f_flags & FASYNC)) { 205 if (unlikely(file->f_flags & FASYNC)) {
205 if (file->f_op->fasync) 206 if (file->f_op->fasync)
206 file->f_op->fasync(-1, file, 0); 207 file->f_op->fasync(-1, file, 0);
207 } 208 }
208 ima_file_free(file);
209 if (file->f_op->release) 209 if (file->f_op->release)
210 file->f_op->release(inode, file); 210 file->f_op->release(inode, file);
211 security_file_free(file); 211 security_file_free(file);
@@ -312,7 +312,7 @@ void put_filp(struct file *file)
312void __init files_init(void) 312void __init files_init(void)
313{ 313{
314 filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0, 314 filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0,
315 SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL); 315 SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT, NULL);
316 percpu_counter_init(&nr_files, 0, GFP_KERNEL); 316 percpu_counter_init(&nr_files, 0, GFP_KERNEL);
317} 317}
318 318