4 files changed, 5 insertions, 9 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 739dda176b43..7f4abe176701 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -737,10 +737,8 @@ int sysfs_create_dir(struct kobject * kobj)
 
         if (kobj->parent)
                 parent_sd = kobj->parent->sd;
-        else if (sysfs_mount && sysfs_mount->mnt_sb)
-                parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;
         else
-                return -EFAULT;
+                parent_sd = &sysfs_root;
 
         error = create_dir(kobj, parent_sd, kobject_name(kobj), &sd);
         if (!error)
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index ac7625631fcf..8989cbb51a39 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -14,7 +14,7 @@
 /* Random magic number */
 #define SYSFS_MAGIC 0x62656572
 
-struct vfsmount *sysfs_mount;
+static struct vfsmount *sysfs_mount;
 struct super_block * sysfs_sb = NULL;
 struct kmem_cache *sysfs_dir_cachep;
 
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index a6b13f12b0e7..8ad38bccc0e4 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -60,10 +60,9 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char
 
         BUG_ON(!name);
 
-        if (!kobj) {
-                if (sysfs_mount && sysfs_mount->mnt_sb)
-                        parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;
-        } else
+        if (!kobj)
+                parent_sd = &sysfs_root;
+        else
                 parent_sd = kobj->sd;
 
         error = -EFAULT;
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 8a0aea1ab86d..77253aabc4af 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -51,7 +51,6 @@ struct sysfs_addrm_cxt {
         int                     cnt;
 };
 
-extern struct vfsmount * sysfs_mount;
 extern struct sysfs_dirent sysfs_root;
 extern struct kmem_cache *sysfs_dir_cachep;