diff options
Diffstat (limited to 'security/smack/smack_lsm.c')
-rw-r--r-- | security/smack/smack_lsm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index ee0bb5735f35..29bb4e7fa5e8 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -251,7 +251,6 @@ static int smack_sb_alloc_security(struct super_block *sb) | |||
251 | sbsp->smk_floor = smack_known_floor.smk_known; | 251 | sbsp->smk_floor = smack_known_floor.smk_known; |
252 | sbsp->smk_hat = smack_known_hat.smk_known; | 252 | sbsp->smk_hat = smack_known_hat.smk_known; |
253 | sbsp->smk_initialized = 0; | 253 | sbsp->smk_initialized = 0; |
254 | spin_lock_init(&sbsp->smk_sblock); | ||
255 | 254 | ||
256 | sb->s_security = sbsp; | 255 | sb->s_security = sbsp; |
257 | 256 | ||
@@ -332,13 +331,10 @@ static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data) | |||
332 | char *commap; | 331 | char *commap; |
333 | char *nsp; | 332 | char *nsp; |
334 | 333 | ||
335 | spin_lock(&sp->smk_sblock); | 334 | if (sp->smk_initialized != 0) |
336 | if (sp->smk_initialized != 0) { | ||
337 | spin_unlock(&sp->smk_sblock); | ||
338 | return 0; | 335 | return 0; |
339 | } | 336 | |
340 | sp->smk_initialized = 1; | 337 | sp->smk_initialized = 1; |
341 | spin_unlock(&sp->smk_sblock); | ||
342 | 338 | ||
343 | for (op = data; op != NULL; op = commap) { | 339 | for (op = data; op != NULL; op = commap) { |
344 | commap = strchr(op, ','); | 340 | commap = strchr(op, ','); |