commit e1c9b23adbe86c725738402857397d7a29f9d6ef
author Mimi Zohar <zohar@linux.vnet.ibm.com> Thu Aug 11 00:22:51 2011 -0400
committer James Morris <jmorris@namei.org> Thu Aug 11 17:42:07 2011 +1000
tree 746d85cd4518480507c7d01b4c25d39d4ef21805
parent 0b024d2446474c6a7c47573af5a35db83f557ce3

evm: building without EVM enabled fixes

- Missing 'inline' on evm_inode_setattr() definition.
Introduced by commit 817b54aa45db ("evm: add evm_inode_setattr to prevent
updating an invalid security.evm").

- Missing security_old_inode_init_security() stub function definition.
Caused by commit 9d8f13ba3f48 ("security: new security_inode_init_security
API adds function callback").

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>

include/linux/evm.h

diff --git a/include/linux/evm.h b/include/linux/evm.h
index db5556d..62deb65 100644
--- a/include/linux/evm.h
+++ b/include/linux/evm.h
@@ -45,7 +45,7 @@
 }
 #endif
 
-static int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
+static inline int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
 {
 	return 0;
 }