1 files changed, 14 insertions, 0 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index aa89edcd2b63..ede40005db28 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -82,6 +82,7 @@ static int populate_dir(struct kobject *kobj)
 
 static int create_dir(struct kobject *kobj)
 {
+        const struct kobj_type *ktype = get_ktype(kobj);
         const struct kobj_ns_type_operations *ops;
         int error;
 
@@ -95,6 +96,14 @@ static int create_dir(struct kobject *kobj)
                 return error;
         }
 
+        if (ktype) {
+                error = sysfs_create_groups(kobj, ktype->default_groups);
+                if (error) {
+                        sysfs_remove_dir(kobj);
+                        return error;
+                }
+        }
+
         /*
          * @kobj->sd may be deleted by an ancestor going away.  Hold an
          * extra reference so that it stays until @kobj is gone.
@@ -584,11 +593,16 @@ EXPORT_SYMBOL_GPL(kobject_move);
 void kobject_del(struct kobject *kobj)
 {
         struct kernfs_node *sd;
+        const struct kobj_type *ktype = get_ktype(kobj);
 
         if (!kobj)
                 return;
 
         sd = kobj->sd;
+
+        if (ktype)
+                sysfs_remove_groups(kobj, ktype->default_groups);
+
         sysfs_remove_dir(kobj);
         sysfs_put(sd);