diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-05-19 13:25:58 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-21 19:45:33 -0400 |
commit | c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121 (patch) | |
tree | e7fcde1841bf0b1d77a5332656f9cf975509c7b8 /fs/hugetlbfs/inode.c | |
parent | b9fc745db833bbf74b4988493b8cd902a84c9415 (diff) |
integrity: move ima_counts_get
Based on discussion on lkml (Andrew Morton and Eric Paris),
move ima_counts_get down a layer into shmem/hugetlb__file_setup().
Resolves drm shmem_file_setup() usage case as well.
HD comment:
I still think you're doing this at the wrong level, but recognize
that you probably won't be persuaded until a few more users of
alloc_file() emerge, all wanting your ima_counts_get().
Resolving GEM's shmem_file_setup() is an improvement, so I'll say
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/hugetlbfs/inode.c')
-rw-r--r-- | fs/hugetlbfs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 153d9681192b..ccc62de96df8 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/dnotify.h> | 30 | #include <linux/dnotify.h> |
31 | #include <linux/statfs.h> | 31 | #include <linux/statfs.h> |
32 | #include <linux/security.h> | 32 | #include <linux/security.h> |
33 | #include <linux/ima.h> | ||
33 | 34 | ||
34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
35 | 36 | ||
@@ -997,6 +998,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag) | |||
997 | &hugetlbfs_file_operations); | 998 | &hugetlbfs_file_operations); |
998 | if (!file) | 999 | if (!file) |
999 | goto out_dentry; /* inode is already attached */ | 1000 | goto out_dentry; /* inode is already attached */ |
1001 | ima_counts_get(file); | ||
1000 | 1002 | ||
1001 | return file; | 1003 | return file; |
1002 | 1004 | ||