diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 04:53:03 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:16:47 -0500 |
commit | 0552f879d45cecc35d8e372a591fc5ed863bca58 (patch) | |
tree | f3e0d76f7d5e7cf9a11ef4771294c7b4b552cd89 /fs/file_table.c | |
parent | 7715b521222b6ebb6e927fa261ed91ed687fe454 (diff) | |
download | linux-0552f879d45cecc35d8e372a591fc5ed863bca58.tar.bz2 |
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.c | 2 |
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; } |