diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 10:53:03 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 18:16:47 +0100 |
| commit | 0552f879d45cecc35d8e372a591fc5ed863bca58 (patch) | |
| tree | f3e0d76f7d5e7cf9a11ef4771294c7b4b552cd89 /ipc/shm.c | |
| parent | O_TRUNC open shouldn't fail after file truncation (diff) | |
| download | linux-0552f879d45cecc35d8e372a591fc5ed863bca58.tar.xz 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 'ipc/shm.c')
| -rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 16e39230aa0d..02620fae8e1f 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -39,7 +39,6 @@ #include <linux/nsproxy.h> #include <linux/mount.h> #include <linux/ipc_namespace.h> -#include <linux/ima.h> #include <asm/uaccess.h> @@ -895,7 +894,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) &shm_file_operations); if (!file) goto out_free; - ima_counts_get(file); file->private_data = sfd; file->f_mapping = shp->shm_file->f_mapping; |