summaryrefslogtreecommitdiff
path: root/fs/file_table.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-12-16 04:53:03 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-16 12:16:47 -0500
commit0552f879d45cecc35d8e372a591fc5ed863bca58 (patch)
treef3e0d76f7d5e7cf9a11ef4771294c7b4b552cd89 /fs/file_table.c
parent7715b521222b6ebb6e927fa261ed91ed687fe454 (diff)
downloadlinux-0552f879d45cecc35d8e372a591fc5ed863bca58.tar.gz
Untangling ima mess, part 1: alloc_file()
There are 2 groups of alloc_file() callers: * ones that are followed by ima_counts_get * ones giving non-regular files So let's pull that ima_counts_get() into alloc_file(); it's a no-op in case of non-regular files. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/file_table.c')
-rw-r--r--fs/file_table.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 361d76be8295..17a55b81be2d 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -21,6 +21,7 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
#include <linux/percpu_counter.h>
+#include <linux/ima.h>
#include <asm/atomic.h>
@@ -190,6 +191,7 @@ struct file *alloc_file(struct path *path, fmode_t mode,
error = mnt_clone_write(path->mnt);
WARN_ON(error);
}
+ ima_counts_get(file);
return file;
}