git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux...
[safe/jmp/linux-2.6]
/
fs
/
file_table.c
diff --git
a/fs/file_table.c
b/fs/file_table.c
index
361d76b
..
17a55b8
100644
(file)
--- a/
fs/file_table.c
+++ b/
fs/file_table.c
@@
-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>
@@
-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;
}