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) |
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 d2ec7f029ff..adf8033afd5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/swap.h> | 31 | #include <linux/swap.h> |
32 | #include <linux/ima.h> | ||
33 | 32 | ||
34 | static struct vfsmount *shm_mnt; | 33 | static struct vfsmount *shm_mnt; |
35 | 34 | ||
@@ -2669,7 +2668,6 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags | |||
2669 | if (!file) | 2668 | if (!file) |
2670 | goto put_dentry; | 2669 | goto put_dentry; |
2671 | 2670 | ||
2672 | ima_counts_get(file); | ||
2673 | return file; | 2671 | return file; |
2674 | 2672 | ||
2675 | put_dentry: | 2673 | put_dentry: |