kernfs: s/sysfs/kernfs/ in various data structures
kernfs has just been separated out from sysfs and we're already in full conflict mode. Nothing can make the situation any worse. Let's take the chance to name things properly. This patch performs the following renames. * s/sysfs_open_dirent/kernfs_open_node/ * s/sysfs_open_file/kernfs_open_file/ * s/sysfs_inode_attrs/kernfs_iattrs/ * s/sysfs_addrm_cxt/kernfs_addrm_cxt/ * s/sysfs_super_info/kernfs_super_info/ * s/sysfs_info()/kernfs_info()/ * s/sysfs_open_dirent_lock/kernfs_open_node_lock/ * s/sysfs_open_file_mutex/kernfs_open_file_mutex/ * s/sysfs_of()/kernfs_of()/ This patch is strictly rename only and doesn't introduce any functional difference. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
adc5e8b58f
commit
c525aaddc3
@@ -27,7 +27,7 @@ static const struct super_operations sysfs_ops = {
|
||||
|
||||
static int sysfs_fill_super(struct super_block *sb)
|
||||
{
|
||||
struct sysfs_super_info *info = sysfs_info(sb);
|
||||
struct kernfs_super_info *info = kernfs_info(sb);
|
||||
struct inode *inode;
|
||||
struct dentry *root;
|
||||
|
||||
@@ -61,8 +61,8 @@ static int sysfs_fill_super(struct super_block *sb)
|
||||
|
||||
static int sysfs_test_super(struct super_block *sb, void *data)
|
||||
{
|
||||
struct sysfs_super_info *sb_info = sysfs_info(sb);
|
||||
struct sysfs_super_info *info = data;
|
||||
struct kernfs_super_info *sb_info = kernfs_info(sb);
|
||||
struct kernfs_super_info *info = data;
|
||||
|
||||
return sb_info->root == info->root && sb_info->ns == info->ns;
|
||||
}
|
||||
@@ -84,7 +84,7 @@ static int sysfs_set_super(struct super_block *sb, void *data)
|
||||
*/
|
||||
const void *kernfs_super_ns(struct super_block *sb)
|
||||
{
|
||||
struct sysfs_super_info *info = sysfs_info(sb);
|
||||
struct kernfs_super_info *info = kernfs_info(sb);
|
||||
|
||||
return info->ns;
|
||||
}
|
||||
@@ -107,7 +107,7 @@ struct dentry *kernfs_mount_ns(struct file_system_type *fs_type, int flags,
|
||||
struct kernfs_root *root, const void *ns)
|
||||
{
|
||||
struct super_block *sb;
|
||||
struct sysfs_super_info *info;
|
||||
struct kernfs_super_info *info;
|
||||
int error;
|
||||
|
||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||
@@ -144,12 +144,12 @@ struct dentry *kernfs_mount_ns(struct file_system_type *fs_type, int flags,
|
||||
*/
|
||||
void kernfs_kill_sb(struct super_block *sb)
|
||||
{
|
||||
struct sysfs_super_info *info = sysfs_info(sb);
|
||||
struct kernfs_super_info *info = kernfs_info(sb);
|
||||
struct kernfs_node *root_kn = sb->s_root->d_fsdata;
|
||||
|
||||
/*
|
||||
* Remove the superblock from fs_supers/s_instances
|
||||
* so we can't find it, before freeing sysfs_super_info.
|
||||
* so we can't find it, before freeing kernfs_super_info.
|
||||
*/
|
||||
kill_anon_super(sb);
|
||||
kfree(info);
|
||||
|
Reference in New Issue
Block a user