324a56e16e
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_elem_dir/kernfs_elem_dir/ * s/sysfs_elem_symlink/kernfs_elem_symlink/ * s/sysfs_elem_attr/kernfs_elem_file/ * s/sysfs_dirent/kernfs_node/ * s/sd/kn/ in kernfs proper * s/parent_sd/parent/ * s/target_sd/target/ * s/dir_sd/parent/ * s/to_sysfs_dirent()/rb_to_kn()/ * misc renames of local vars when they conflict with the above Because md, mic and gpio dig into sysfs details, this patch ends up modifying them. All are sysfs_dirent renames and trivial. While we can avoid these by introducing a dummy wrapping struct sysfs_dirent around kernfs_node, given the limited usage outside kernfs and sysfs proper, I don't think such workaround is called for. This patch is strictly rename only and doesn't introduce any functional difference. - mic / gpio renames were missing. Spotted by kbuild test robot. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Neil Brown <neilb@suse.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com> Cc: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
43 lines
916 B
C
43 lines
916 B
C
/*
|
|
* fs/sysfs/sysfs.h - sysfs internal header file
|
|
*
|
|
* Copyright (c) 2001-3 Patrick Mochel
|
|
* Copyright (c) 2007 SUSE Linux Products GmbH
|
|
* Copyright (c) 2007 Tejun Heo <teheo@suse.de>
|
|
*
|
|
* This file is released under the GPLv2.
|
|
*/
|
|
|
|
#ifndef __SYSFS_INTERNAL_H
|
|
#define __SYSFS_INTERNAL_H
|
|
|
|
#include <linux/sysfs.h>
|
|
|
|
/*
|
|
* mount.c
|
|
*/
|
|
extern struct kernfs_node *sysfs_root_kn;
|
|
|
|
/*
|
|
* dir.c
|
|
*/
|
|
extern spinlock_t sysfs_symlink_target_lock;
|
|
|
|
void sysfs_warn_dup(struct kernfs_node *parent, const char *name);
|
|
|
|
/*
|
|
* file.c
|
|
*/
|
|
int sysfs_add_file(struct kernfs_node *parent,
|
|
const struct attribute *attr, bool is_bin);
|
|
int sysfs_add_file_mode_ns(struct kernfs_node *parent,
|
|
const struct attribute *attr, bool is_bin,
|
|
umode_t amode, const void *ns);
|
|
|
|
/*
|
|
* symlink.c
|
|
*/
|
|
int sysfs_create_link_sd(struct kernfs_node *kn, struct kobject *target,
|
|
const char *name);
|
|
|
|
#endif /* __SYSFS_INTERNAL_H */
|