summaryrefslogtreecommitdiff
path: root/ipc/shm.c
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 /ipc/shm.c
parentb9fc745db833bbf74b4988493b8cd902a84c9415 (diff)
downloadlinux-3.10-c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121.tar.gz
linux-3.10-c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121.tar.bz2
linux-3.10-c9d9ac525a0285a5b5ad9c3f9aa8b7c1753e6121.zip
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 'ipc/shm.c')
-rw-r--r--ipc/shm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 47b464229cd..56081835359 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -384,7 +384,6 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
error = PTR_ERR(file);
if (IS_ERR(file))
goto no_file;
- ima_counts_get(file);
id = ipc_addid(&shm_ids(ns), &shp->shm_perm, ns->shm_ctlmni);
if (id < 0) {