Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[sfrench/cifs-2.6.git] / include / linux / ima.h

diff --git a/include/linux/ima.h b/include/linux/ima.h
index b1b827d091a995e3d5b2e4a0d1e7f18e975e9319..99dc6d5cf7e59bc0412fbbd7afad788f04db933f 100644 (file)
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -13,14 +13,11 @@
 #include <linux/fs.h>
 struct linux_binprm;
 
-#define IMA_COUNT_UPDATE 1
-#define IMA_COUNT_LEAVE 0
-
 #ifdef CONFIG_IMA
 extern int ima_bprm_check(struct linux_binprm *bprm);
 extern int ima_inode_alloc(struct inode *inode);
 extern void ima_inode_free(struct inode *inode);
-extern int ima_path_check(struct path *path, int mask, int update_counts);
+extern int ima_path_check(struct path *path, int mask);
 extern void ima_file_free(struct file *file);
 extern int ima_file_mmap(struct file *file, unsigned long prot);
 extern void ima_counts_get(struct file *file);
@@ -41,7 +38,7 @@ static inline void ima_inode_free(struct inode *inode)
        return;
 }
 
-static inline int ima_path_check(struct path *path, int mask, int update_counts)
+static inline int ima_path_check(struct path *path, int mask)
 {
        return 0;
 }
@@ -60,5 +57,6 @@ static inline void ima_counts_get(struct file *file)
 {
        return;
 }
+
 #endif /* CONFIG_IMA_H */
 #endif /* _LINUX_IMA_H */