Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d0c7d67 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0333cd8a

fs/sysfs/dir.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -737,10 +737,8 @@ int sysfs_create_dir(struct kobject * kobj) 




	if (kobj->parent)

	if (kobj->parent)

		parent_sd = kobj->parent->sd;

		parent_sd = kobj->parent->sd;

	else if (sysfs_mount && sysfs_mount->mnt_sb)

		parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;

	else

	else

		return -EFAULT;

		parent_sd = &sysfs_root;





	error = create_dir(kobj, parent_sd, kobject_name(kobj), &sd);

	error = create_dir(kobj, parent_sd, kobject_name(kobj), &sd);

	if (!error)

	if (!error)

fs/sysfs/mount.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
/* Random magic number */

/* Random magic number */

#define SYSFS_MAGIC 0x62656572

#define SYSFS_MAGIC 0x62656572





struct vfsmount *sysfs_mount;

static struct vfsmount *sysfs_mount;

struct super_block * sysfs_sb = NULL;

struct super_block * sysfs_sb = NULL;

struct kmem_cache *sysfs_dir_cachep;

struct kmem_cache *sysfs_dir_cachep;

fs/sysfs/symlink.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -60,10 +60,9 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char 




	BUG_ON(!name);

	BUG_ON(!name);





	if (!kobj) {

	if (!kobj)

		if (sysfs_mount && sysfs_mount->mnt_sb)

		parent_sd = &sysfs_root;

			parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;

	else

	} else

		parent_sd = kobj->sd;

		parent_sd = kobj->sd;





	error = -EFAULT;

	error = -EFAULT;

fs/sysfs/sysfs.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,6 @@ struct sysfs_addrm_cxt { 
	int			cnt;

	int			cnt;

};

};





extern struct vfsmount * sysfs_mount;

extern struct sysfs_dirent sysfs_root;

extern struct sysfs_dirent sysfs_root;

extern struct kmem_cache *sysfs_dir_cachep;

extern struct kmem_cache *sysfs_dir_cachep;