From 447f4799f5521685672fb0330cbfa172223fcaa2 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Wed, 22 Mar 2006 00:09:18 -0800
Subject: [PATCH] --- yaml --- r: 22512 b: refs/heads/master c:
 253a8b1db1af146d3a7eef0f3626781df12c7141 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/security/selinux/selinuxfs.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ac1474bf4275..793148b9f5db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 161ce45a8a34ba81673f60c603e6fc6d37d99c8f
+refs/heads/master: 253a8b1db1af146d3a7eef0f3626781df12c7141
diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c
index 1bfb40701b5a..ab7c9935c29a 100644
--- a/trunk/security/selinux/selinuxfs.c
+++ b/trunk/security/selinux/selinuxfs.c
@@ -970,7 +970,7 @@ static int sel_make_bools(void)
 	return ret;
 err:
 	kfree(values);
-	d_genocide(dir);
+	sel_remove_bools(dir);
 	ret = -ENOMEM;
 	goto out;
 }
@@ -1226,9 +1226,6 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
 		goto err;
 
 	bool_dir = dentry;
-	ret = sel_make_bools();
-	if (ret)
-		goto err;
 
 	dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
 	if (!dentry) {