Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 177408
b: refs/heads/master
c: 0552f87
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Dec 16, 2009
1 parent b509307 commit 9bb0ccd
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7715b521222b6ebb6e927fa261ed91ed687fe454
refs/heads/master: 0552f879d45cecc35d8e372a591fc5ed863bca58
2 changes: 2 additions & 0 deletions trunk/fs/file_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
#include <linux/percpu_counter.h>
#include <linux/ima.h>

#include <asm/atomic.h>

Expand Down Expand Up @@ -190,6 +191,7 @@ struct file *alloc_file(struct path *path, fmode_t mode,
error = mnt_clone_write(path->mnt);
WARN_ON(error);
}
ima_counts_get(file);
return file;
}

Expand Down
2 changes: 0 additions & 2 deletions trunk/fs/hugetlbfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <linux/dnotify.h>
#include <linux/statfs.h>
#include <linux/security.h>
#include <linux/ima.h>
#include <linux/magic.h>

#include <asm/uaccess.h>
Expand Down Expand Up @@ -971,7 +970,6 @@ 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;

Expand Down
2 changes: 0 additions & 2 deletions trunk/ipc/shm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions trunk/mm/shmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/swap.h>
#include <linux/ima.h>

static struct vfsmount *shm_mnt;

Expand Down Expand Up @@ -2669,7 +2668,6 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
if (!file)
goto put_dentry;

ima_counts_get(file);
return file;

put_dentry:
Expand Down

0 comments on commit 9bb0ccd

Please sign in to comment.