1 files changed, 31 insertions, 28 deletions

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 1898a10e38ce..7177532b8f7b 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -26,7 +26,7 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
 
         if (grp->attrs)
                 for (attr = grp->attrs; *attr; attr++)
-                        sysfs_hash_and_remove(dir_sd, (*attr)->name, NULL);
+                        kernfs_remove_by_name(dir_sd, (*attr)->name);
         if (grp->bin_attrs)
                 for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++)
                         sysfs_remove_bin_file(kobj, *bin_attr);
@@ -49,15 +49,13 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
                          * re-adding (if required) the file.
                          */
                         if (update)
-                                sysfs_hash_and_remove(dir_sd, (*attr)->name,
-                                                      NULL);
+                                kernfs_remove_by_name(dir_sd, (*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,
-                                                       SYSFS_KOBJ_ATTR,
+                        error = sysfs_add_file_mode_ns(dir_sd, *attr, false,
                                                        (*attr)->mode | mode,
                                                        NULL);
                         if (unlikely(error))
@@ -102,18 +100,21 @@ static int internal_create_group(struct kobject *kobj, int update,
                 return -EINVAL;
         }
         if (grp->name) {
-                error = sysfs_create_subdir(kobj, grp->name, &sd);
-                if (error)
-                        return error;
+                sd = kernfs_create_dir(kobj->sd, grp->name, kobj);
+                if (IS_ERR(sd)) {
+                        if (PTR_ERR(sd) == -EEXIST)
+                                sysfs_warn_dup(kobj->sd, grp->name);
+                        return PTR_ERR(sd);
+                }
         } else
                 sd = kobj->sd;
-        sysfs_get(sd);
+        kernfs_get(sd);
         error = create_files(sd, kobj, grp, update);
         if (error) {
                 if (grp->name)
-                        sysfs_remove(sd);
+                        kernfs_remove(sd);
         }
-        sysfs_put(sd);
+        kernfs_put(sd);
         return error;
 }
 
@@ -207,21 +208,23 @@ void sysfs_remove_group(struct kobject *kobj,
         struct sysfs_dirent *sd;
 
         if (grp->name) {
-                sd = sysfs_get_dirent(dir_sd, grp->name);
+                sd = kernfs_find_and_get(dir_sd, grp->name);
                 if (!sd) {
                         WARN(!sd, KERN_WARNING
                              "sysfs group %p not found for kobject '%s'\n",
                              grp, kobject_name(kobj));
                         return;
                 }
-        } else
-                sd = sysfs_get(dir_sd);
+        } else {
+                sd = dir_sd;
+                kernfs_get(sd);
+        }
 
         remove_files(sd, kobj, grp);
         if (grp->name)
-                sysfs_remove(sd);
+                kernfs_remove(sd);
 
-        sysfs_put(sd);
+        kernfs_put(sd);
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_group);
 
@@ -262,17 +265,17 @@ int sysfs_merge_group(struct kobject *kobj,
         struct attribute *const *attr;
         int i;
 
-        dir_sd = sysfs_get_dirent(kobj->sd, grp->name);
+        dir_sd = kernfs_find_and_get(kobj->sd, grp->name);
         if (!dir_sd)
                 return -ENOENT;
 
         for ((i = 0, attr = grp->attrs); *attr && !error; (++i, ++attr))
-                error = sysfs_add_file(dir_sd, *attr, SYSFS_KOBJ_ATTR);
+                error = sysfs_add_file(dir_sd, *attr, false);
         if (error) {
                 while (--i >= 0)
-                        sysfs_hash_and_remove(dir_sd, (*--attr)->name, NULL);
+                        kernfs_remove_by_name(dir_sd, (*--attr)->name);
         }
-        sysfs_put(dir_sd);
+        kernfs_put(dir_sd);
 
         return error;
 }
@@ -289,11 +292,11 @@ void sysfs_unmerge_group(struct kobject *kobj,
         struct sysfs_dirent *dir_sd;
         struct attribute *const *attr;
 
-        dir_sd = sysfs_get_dirent(kobj->sd, grp->name);
+        dir_sd = kernfs_find_and_get(kobj->sd, grp->name);
         if (dir_sd) {
                 for (attr = grp->attrs; *attr; ++attr)
-                        sysfs_hash_and_remove(dir_sd, (*attr)->name, NULL);
-                sysfs_put(dir_sd);
+                        kernfs_remove_by_name(dir_sd, (*attr)->name);
+                kernfs_put(dir_sd);
         }
 }
 EXPORT_SYMBOL_GPL(sysfs_unmerge_group);
@@ -311,12 +314,12 @@ int sysfs_add_link_to_group(struct kobject *kobj, const char *group_name,
         struct sysfs_dirent *dir_sd;
         int error = 0;
 
-        dir_sd = sysfs_get_dirent(kobj->sd, group_name);
+        dir_sd = kernfs_find_and_get(kobj->sd, group_name);
         if (!dir_sd)
                 return -ENOENT;
 
         error = sysfs_create_link_sd(dir_sd, target, link_name);
-        sysfs_put(dir_sd);
+        kernfs_put(dir_sd);
 
         return error;
 }
@@ -333,10 +336,10 @@ void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
 {
         struct sysfs_dirent *dir_sd;
 
-        dir_sd = sysfs_get_dirent(kobj->sd, group_name);
+        dir_sd = kernfs_find_and_get(kobj->sd, group_name);
         if (dir_sd) {
-                sysfs_hash_and_remove(dir_sd, link_name, NULL);
-                sysfs_put(dir_sd);
+                kernfs_remove_by_name(dir_sd, link_name);
+                kernfs_put(dir_sd);
         }
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_link_from_group);