X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=security%2Fsecurity.c;h=3ef5e2a7a741aca4b13cd08b571e0a0ca0ee7d72;hb=925d169f5b86fe57e2f5264ea574cce9a89b719d;hp=b50f472061a43c6ec7fb53781c084fb2cb487dcb;hpb=1765a1fe5d6f82c0eceb1ad10594cfc83759b6d0;p=net-next-2.6.git

diff --git a/security/security.c b/security/security.c
index b50f472061a..3ef5e2a7a74 100644
--- a/security/security.c
+++ b/security/security.c
@@ -325,16 +325,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)