From 6ae85e6204e1d4724575db8536e808c30c4835e7 Mon Sep 17 00:00:00 2001
From: Casey Schaufler <casey@schaufler-ca.com>
Date: Wed, 23 May 2012 17:46:58 -0700
Subject: [PATCH] --- yaml --- r: 313616 b: refs/heads/master c:
 eb982cb4cf6405b97ea1f9e1d10864981f269d46 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/security/smack/smack.h     | 1 -
 trunk/security/smack/smack_lsm.c | 8 ++------
 trunk/security/smack/smackfs.c   | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4174899bb8b4..bbb277a90735 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 417c6c8ee2eb6975f357d8975af94ba5fbeaf82d
+refs/heads/master: eb982cb4cf6405b97ea1f9e1d10864981f269d46
diff --git a/trunk/security/smack/smack.h b/trunk/security/smack/smack.h
index cc361b8f3d13..76feb31eb823 100644
--- a/trunk/security/smack/smack.h
+++ b/trunk/security/smack/smack.h
@@ -43,7 +43,6 @@ struct superblock_smack {
 	char		*smk_hat;
 	char		*smk_default;
 	int		smk_initialized;
-	spinlock_t	smk_sblock;	/* for initialization */
 };
 
 struct socket_smack {
diff --git a/trunk/security/smack/smack_lsm.c b/trunk/security/smack/smack_lsm.c
index ee0bb5735f35..29bb4e7fa5e8 100644
--- a/trunk/security/smack/smack_lsm.c
+++ b/trunk/security/smack/smack_lsm.c
@@ -251,7 +251,6 @@ static int smack_sb_alloc_security(struct super_block *sb)
 	sbsp->smk_floor = smack_known_floor.smk_known;
 	sbsp->smk_hat = smack_known_hat.smk_known;
 	sbsp->smk_initialized = 0;
-	spin_lock_init(&sbsp->smk_sblock);
 
 	sb->s_security = sbsp;
 
@@ -332,13 +331,10 @@ static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data)
 	char *commap;
 	char *nsp;
 
-	spin_lock(&sp->smk_sblock);
-	if (sp->smk_initialized != 0) {
-		spin_unlock(&sp->smk_sblock);
+	if (sp->smk_initialized != 0)
 		return 0;
-	}
+
 	sp->smk_initialized = 1;
-	spin_unlock(&sp->smk_sblock);
 
 	for (op = data; op != NULL; op = commap) {
 		commap = strchr(op, ',');
diff --git a/trunk/security/smack/smackfs.c b/trunk/security/smack/smackfs.c
index 1810c9a4ed48..3686db7e2c6b 100644
--- a/trunk/security/smack/smackfs.c
+++ b/trunk/security/smack/smackfs.c
@@ -2051,7 +2051,6 @@ static int smk_fill_super(struct super_block *sb, void *data, int silent)
 	}
 
 	root_inode = sb->s_root->d_inode;
-	root_inode->i_security = new_inode_smack(smack_known_floor.smk_known);
 
 	return 0;
 }