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>

1 files changed, 48 insertions, 48 deletions

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 7177532b8f7b..4d00d3996477 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -18,7 +18,7 @@
 #include "sysfs.h"
 
 
-static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
+static void remove_files(struct kernfs_node *parent, struct kobject *kobj,
                          const struct attribute_group *grp)
 {
         struct attribute *const *attr;
@@ -26,13 +26,13 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
 
         if (grp->attrs)
                 for (attr = grp->attrs; *attr; attr++)
-                        kernfs_remove_by_name(dir_sd, (*attr)->name);
+                        kernfs_remove_by_name(parent, (*attr)->name);
         if (grp->bin_attrs)
                 for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++)
                         sysfs_remove_bin_file(kobj, *bin_attr);
 }
 
-static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
+static int create_files(struct kernfs_node *parent, struct kobject *kobj,
                         const struct attribute_group *grp, int update)
 {
         struct attribute *const *attr;
@@ -49,20 +49,20 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
                          * re-adding (if required) the file.
                          */
                         if (update)
-                                kernfs_remove_by_name(dir_sd, (*attr)->name);
+                                kernfs_remove_by_name(parent, (*attr)->name);
                         if (grp->is_visible) {
                                 mode = grp->is_visible(kobj, *attr, i);
                                 if (!mode)
                                         continue;
                         }
-                        error = sysfs_add_file_mode_ns(dir_sd, *attr, false,
+                        error = sysfs_add_file_mode_ns(parent, *attr, false,
                                                        (*attr)->mode | mode,
                                                        NULL);
                         if (unlikely(error))
                                 break;
                 }
                 if (error) {
-                        remove_files(dir_sd, kobj, grp);
+                        remove_files(parent, kobj, grp);
                         goto exit;
                 }
         }
@@ -76,7 +76,7 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
                                 break;
                 }
                 if (error)
-                        remove_files(dir_sd, kobj, grp);
+                        remove_files(parent, kobj, grp);
         }
 exit:
         return error;
@@ -86,7 +86,7 @@ exit:
 static int internal_create_group(struct kobject *kobj, int update,
                                  const struct attribute_group *grp)
 {
-        struct sysfs_dirent *sd;
+        struct kernfs_node *kn;
         int error;
 
         BUG_ON(!kobj || (!update && !kobj->sd));
@@ -100,21 +100,21 @@ static int internal_create_group(struct kobject *kobj, int update,
                 return -EINVAL;
         }
         if (grp->name) {
-                sd = kernfs_create_dir(kobj->sd, grp->name, kobj);
-                if (IS_ERR(sd)) {
-                        if (PTR_ERR(sd) == -EEXIST)
+                kn = kernfs_create_dir(kobj->sd, grp->name, kobj);
+                if (IS_ERR(kn)) {
+                        if (PTR_ERR(kn) == -EEXIST)
                                 sysfs_warn_dup(kobj->sd, grp->name);
-                        return PTR_ERR(sd);
+                        return PTR_ERR(kn);
                 }
         } else
-                sd = kobj->sd;
-        kernfs_get(sd);
-        error = create_files(sd, kobj, grp, update);
+                kn = kobj->sd;
+        kernfs_get(kn);
+        error = create_files(kn, kobj, grp, update);
         if (error) {
                 if (grp->name)
-                        kernfs_remove(sd);
+                        kernfs_remove(kn);
         }
-        kernfs_put(sd);
+        kernfs_put(kn);
         return error;
 }
 
@@ -204,27 +204,27 @@ EXPORT_SYMBOL_GPL(sysfs_update_group);
 void sysfs_remove_group(struct kobject *kobj,
                         const struct attribute_group *grp)
 {
-        struct sysfs_dirent *dir_sd = kobj->sd;
-        struct sysfs_dirent *sd;
+        struct kernfs_node *parent = kobj->sd;
+        struct kernfs_node *kn;
 
         if (grp->name) {
-                sd = kernfs_find_and_get(dir_sd, grp->name);
-                if (!sd) {
-                        WARN(!sd, KERN_WARNING
+                kn = kernfs_find_and_get(parent, grp->name);
+                if (!kn) {
+                        WARN(!kn, KERN_WARNING
                              "sysfs group %p not found for kobject '%s'\n",
                              grp, kobject_name(kobj));
                         return;
                 }
         } else {
-                sd = dir_sd;
-                kernfs_get(sd);
+                kn = parent;
+                kernfs_get(kn);
         }
 
-        remove_files(sd, kobj, grp);
+        remove_files(kn, kobj, grp);
         if (grp->name)
-                kernfs_remove(sd);
+                kernfs_remove(kn);
 
-        kernfs_put(sd);
+        kernfs_put(kn);
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_group);
 
@@ -260,22 +260,22 @@ EXPORT_SYMBOL_GPL(sysfs_remove_groups);
 int sysfs_merge_group(struct kobject *kobj,
                        const struct attribute_group *grp)
 {
-        struct sysfs_dirent *dir_sd;
+        struct kernfs_node *parent;
         int error = 0;
         struct attribute *const *attr;
         int i;
 
-        dir_sd = kernfs_find_and_get(kobj->sd, grp->name);
-        if (!dir_sd)
+        parent = kernfs_find_and_get(kobj->sd, grp->name);
+        if (!parent)
                 return -ENOENT;
 
         for ((i = 0, attr = grp->attrs); *attr && !error; (++i, ++attr))
-                error = sysfs_add_file(dir_sd, *attr, false);
+                error = sysfs_add_file(parent, *attr, false);
         if (error) {
                 while (--i >= 0)
-                        kernfs_remove_by_name(dir_sd, (*--attr)->name);
+                        kernfs_remove_by_name(parent, (*--attr)->name);
         }
-        kernfs_put(dir_sd);
+        kernfs_put(parent);
 
         return error;
 }
@@ -289,14 +289,14 @@ EXPORT_SYMBOL_GPL(sysfs_merge_group);
 void sysfs_unmerge_group(struct kobject *kobj,
                        const struct attribute_group *grp)
 {
-        struct sysfs_dirent *dir_sd;
+        struct kernfs_node *parent;
         struct attribute *const *attr;
 
-        dir_sd = kernfs_find_and_get(kobj->sd, grp->name);
-        if (dir_sd) {
+        parent = kernfs_find_and_get(kobj->sd, grp->name);
+        if (parent) {
                 for (attr = grp->attrs; *attr; ++attr)
-                        kernfs_remove_by_name(dir_sd, (*attr)->name);
-                kernfs_put(dir_sd);
+                        kernfs_remove_by_name(parent, (*attr)->name);
+                kernfs_put(parent);
         }
 }
 EXPORT_SYMBOL_GPL(sysfs_unmerge_group);
@@ -311,15 +311,15 @@ EXPORT_SYMBOL_GPL(sysfs_unmerge_group);
 int sysfs_add_link_to_group(struct kobject *kobj, const char *group_name,
                             struct kobject *target, const char *link_name)
 {
-        struct sysfs_dirent *dir_sd;
+        struct kernfs_node *parent;
         int error = 0;
 
-        dir_sd = kernfs_find_and_get(kobj->sd, group_name);
-        if (!dir_sd)
+        parent = kernfs_find_and_get(kobj->sd, group_name);
+        if (!parent)
                 return -ENOENT;
 
-        error = sysfs_create_link_sd(dir_sd, target, link_name);
-        kernfs_put(dir_sd);
+        error = sysfs_create_link_sd(parent, target, link_name);
+        kernfs_put(parent);
 
         return error;
 }
@@ -334,12 +334,12 @@ EXPORT_SYMBOL_GPL(sysfs_add_link_to_group);
 void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
                                   const char *link_name)
 {
-        struct sysfs_dirent *dir_sd;
+        struct kernfs_node *parent;
 
-        dir_sd = kernfs_find_and_get(kobj->sd, group_name);
-        if (dir_sd) {
-                kernfs_remove_by_name(dir_sd, link_name);
-                kernfs_put(dir_sd);
+        parent = kernfs_find_and_get(kobj->sd, group_name);
+        if (parent) {
+                kernfs_remove_by_name(parent, link_name);
+                kernfs_put(parent);
         }
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_link_from_group);