mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-20 21:51:05 +00:00
kernfs: s/sysfs_dirent/kernfs_node/ and rename its friends accordingly
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>
This commit is contained in:
parent
a8b1c01936
commit
324a56e16e
21 changed files with 773 additions and 772 deletions
|
@ -438,26 +438,26 @@ static inline int sysfs_rename_link(struct kobject *kobj, struct kobject *target
|
|||
return sysfs_rename_link_ns(kobj, target, old_name, new_name, NULL);
|
||||
}
|
||||
|
||||
static inline void sysfs_notify_dirent(struct sysfs_dirent *sd)
|
||||
static inline void sysfs_notify_dirent(struct kernfs_node *kn)
|
||||
{
|
||||
kernfs_notify(sd);
|
||||
kernfs_notify(kn);
|
||||
}
|
||||
|
||||
static inline struct sysfs_dirent *
|
||||
sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name)
|
||||
static inline struct kernfs_node *sysfs_get_dirent(struct kernfs_node *parent,
|
||||
const unsigned char *name)
|
||||
{
|
||||
return kernfs_find_and_get(parent_sd, name);
|
||||
return kernfs_find_and_get(parent, name);
|
||||
}
|
||||
|
||||
static inline struct sysfs_dirent *sysfs_get(struct sysfs_dirent *sd)
|
||||
static inline struct kernfs_node *sysfs_get(struct kernfs_node *kn)
|
||||
{
|
||||
kernfs_get(sd);
|
||||
return sd;
|
||||
kernfs_get(kn);
|
||||
return kn;
|
||||
}
|
||||
|
||||
static inline void sysfs_put(struct sysfs_dirent *sd)
|
||||
static inline void sysfs_put(struct kernfs_node *kn)
|
||||
{
|
||||
kernfs_put(sd);
|
||||
kernfs_put(kn);
|
||||
}
|
||||
|
||||
#endif /* _SYSFS_H_ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue