sysfs: Make sysfs_mount static

This patch modifies the users of sysfs_mount to use sysfs_root
instead (which is what they are looking for).  It then
makes sysfs_mount static to keep people from using it
by accident.

The net result is slightly faster and cleaner code.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 739dda176b434ebbd3a820b19e9e68df65ca43d2..7f4abe17670116bcf62b8e9dcba4f0c9dd37c82c 100644 (file)
--- 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 ac7625631fcfc0f5ae369a998b49804d1c961fe6..8989cbb51a39980f5dc45d93c0b7c9ee61484149 100644 (file)
--- 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 a6b13f12b0e73c5a3275aab2301ee993f57b3bad..8ad38bccc0e4dda213a3dadd8fe0fef40f2e528c 100644 (file)
--- 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 8a0aea1ab86d59fd744373612142af32e9f78bcc..77253aabc4af8eb6e2c8331b5125db979f4ef6c3 100644 (file)
--- 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;