X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=security%2Finode.c;h=d0b1a88da557efdc6355209c10ef36ccf9ddcce2;hb=618910362d9e666cc76f2eb6280b01e6fb9a6dc3;hp=8e7ca62078abe85f988a90b796f265fc2172d526;hpb=89de77a8c557f14d2713a1f43fbc33980e639b98;p=android-x86%2Fkernel.git

diff --git a/security/inode.c b/security/inode.c
index 8e7ca62078ab..d0b1a88da557 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -203,7 +203,7 @@ void securityfs_remove(struct dentry *dentry)
 	mutex_lock(&parent->d_inode->i_mutex);
 	if (positive(dentry)) {
 		if (dentry->d_inode) {
-			if (S_ISDIR(dentry->d_inode->i_mode))
+			if (d_is_dir(dentry))
 				simple_rmdir(parent->d_inode, dentry);
 			else
 				simple_unlink(parent->d_inode, dentry);
@@ -215,19 +215,17 @@ void securityfs_remove(struct dentry *dentry)
 }
 EXPORT_SYMBOL_GPL(securityfs_remove);
 
-static struct kobject *security_kobj;
-
 static int __init securityfs_init(void)
 {
 	int retval;
 
-	security_kobj = kobject_create_and_add("security", kernel_kobj);
-	if (!security_kobj)
-		return -EINVAL;
+	retval = sysfs_create_mount_point(kernel_kobj, "security");
+	if (retval)
+		return retval;
 
 	retval = register_filesystem(&fs_type);
 	if (retval)
-		kobject_put(security_kobj);
+		sysfs_remove_mount_point(kernel_kobj, "security");
 	return retval;
 }