sysfs: Create mountpoints with sysfs_create_mount_point

commit f9bb48825a6b5d02f4cabcc78967c75db903dcdc upstream.

This allows for better documentation in the code and
it allows for a simpler and fully correct version of
fs_fully_visible to be written.

The mount points converted and their filesystems are:
/sys/hypervisor/s390/       s390_hypfs
/sys/kernel/config/         configfs
/sys/kernel/debug/          debugfs
/sys/firmware/efi/efivars/  efivarfs
/sys/fs/fuse/connections/   fusectl
/sys/fs/pstore/             pstore
/sys/kernel/tracing/        tracefs
/sys/fs/cgroup/             cgroup
/sys/kernel/security/       securityfs
/sys/fs/selinux/            selinuxfs
/sys/fs/smackfs/            smackfs

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 13 insertions, 16 deletions

diff --git a/security/inode.c b/security/inode.c
index 91503b79c5f8..0e37e4fba8fa 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -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;
 }
 
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index d2787cca1fcb..3d2201413028 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1853,7 +1853,6 @@ static struct file_system_type sel_fs_type = {
 };
 
 struct vfsmount *selinuxfs_mount;
-static struct kobject *selinuxfs_kobj;
 
 static int __init init_sel_fs(void)
 {
@@ -1862,13 +1861,13 @@ static int __init init_sel_fs(void)
         if (!selinux_enabled)
                 return 0;
 
-        selinuxfs_kobj = kobject_create_and_add("selinux", fs_kobj);
-        if (!selinuxfs_kobj)
-                return -ENOMEM;
+        err = sysfs_create_mount_point(fs_kobj, "selinux");
+        if (err)
+                return err;
 
         err = register_filesystem(&sel_fs_type);
         if (err) {
-                kobject_put(selinuxfs_kobj);
+                sysfs_remove_mount_point(fs_kobj, "selinux");
                 return err;
         }
 
@@ -1887,7 +1886,7 @@ __initcall(init_sel_fs);
 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
 void exit_sel_fs(void)
 {
-        kobject_put(selinuxfs_kobj);
+        sysfs_remove_mount_point(fs_kobj, "selinux");
         kern_unmount(selinuxfs_mount);
         unregister_filesystem(&sel_fs_type);
 }
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index d9682985349e..ac4cac7c661a 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -2241,16 +2241,16 @@ static const struct file_operations smk_revoke_subj_ops = {
         .llseek         = generic_file_llseek,
 };
 
-static struct kset *smackfs_kset;
 /**
  * smk_init_sysfs - initialize /sys/fs/smackfs
  *
  */
 static int smk_init_sysfs(void)
 {
-        smackfs_kset = kset_create_and_add("smackfs", NULL, fs_kobj);
-        if (!smackfs_kset)
-                return -ENOMEM;
+        int err;
+        err = sysfs_create_mount_point(fs_kobj, "smackfs");
+        if (err)
+                return err;
         return 0;
 }