IMA: only allocate iint when needed

[net-next-2.6.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index c53949f17d9e0dddc0601032576ef2922fb88f86..a3b47feccae9ca72680736a06bb8b34ae9b9185a 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -333,16 +333,8 @@ EXPORT_SYMBOL(security_sb_parse_opts_str);
 
 int security_inode_alloc(struct inode *inode)
 {
-       int ret;
-
        inode->i_security = NULL;
-       ret =  security_ops->inode_alloc_security(inode);
-       if (ret)
-               return ret;
-       ret = ima_inode_alloc(inode);
-       if (ret)
-               security_inode_free(inode);
-       return ret;
+       return security_ops->inode_alloc_security(inode);
 }
 
 void security_inode_free(struct inode *inode)