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 /mm/shmem.c | |
| parent | 7715b521222b6ebb6e927fa261ed91ed687fe454 (diff) | |
| download | linux-0552f879d45cecc35d8e372a591fc5ed863bca58.tar.gz linux-0552f879d45cecc35d8e372a591fc5ed863bca58.tar.bz2 linux-0552f879d45cecc35d8e372a591fc5ed863bca58.zip | |
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 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index d2ec7f029ff4..adf8033afd52 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -29,7 +29,6 @@ #include <linux/mm.h> #include <linux/module.h> #include <linux/swap.h> -#include <linux/ima.h> static struct vfsmount *shm_mnt; @@ -2669,7 +2668,6 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags if (!file) goto put_dentry; - ima_counts_get(file); return file; put_dentry: |