aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hugetlbfs
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2009-05-19 13:25:58 -0400
committerJames Morris <jmorris@namei.org>2009-05-22 09:45:33 +1000
commitc9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121 (patch)
treee7fcde1841bf0b1d77a5332656f9cf975509c7b8 /fs/hugetlbfs
parentb9fc745db833bbf74b4988493b8cd902a84c9415 (diff)
downloadkernel_goldelico_gta04-c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121.zip
kernel_goldelico_gta04-c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121.tar.gz
kernel_goldelico_gta04-c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121.tar.bz2
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')
-rw-r--r--fs/hugetlbfs/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 153d968..ccc62de 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -30,6 +30,7 @@
#include <linux/dnotify.h>
#include <linux/statfs.h>
#include <linux/security.h>
+#include <linux/ima.h>
#include <asm/uaccess.h>
@@ -997,6 +998,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag)
&hugetlbfs_file_operations);
if (!file)
goto out_dentry; /* inode is already attached */
+ ima_counts_get(file);
return file;