From 5810a818ba9dfd0aad7000b1ef0d02a1021e339a Mon Sep 17 00:00:00 2001 From: James Morris Date: Wed, 22 Mar 2006 00:09:21 -0800 Subject: [PATCH] --- yaml --- r: 22515 b: refs/heads/master c: cf01efd098597f7ee88a61e645afacba987c4531 h: refs/heads/master i: 22513: 1730135e8d81e49846f206b65f5460442861d877 22511: 53b384ab72979af405bf67d698e0eef5fa2313f2 v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34984d02a92c..e431bbf54070 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edb20fb5be2ff6943920aca4ccab0f4fdacddb9c +refs/heads/master: cf01efd098597f7ee88a61e645afacba987c4531 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 9ff51c668f06..bdd0b32f0104 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -1929,7 +1929,6 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, struct task_security_struct *tsec; struct inode_security_struct *dsec; struct superblock_security_struct *sbsec; - struct inode_security_struct *isec; u32 newsid, clen; int rc; char *namep = NULL, *context; @@ -1937,7 +1936,6 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, tsec = current->security; dsec = dir->i_security; sbsec = dir->i_sb->s_security; - isec = inode->i_security; if (tsec->create_sid && sbsec->behavior != SECURITY_FS_USE_MNTPOINT) { newsid = tsec->create_sid;