6 files changed, 10 insertions, 8 deletions

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 4a0576bd06fc..3706b2bc0987 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -743,7 +743,7 @@ static struct kobj_type ktype_mc_set_attribs = {
  *      /sys/devices/system/edac/mc
  */
 static struct kset mc_kset = {
-        .kobj = {.name = "mc", .ktype = &ktype_mc_set_attribs },
+        .kobj = {.ktype = &ktype_mc_set_attribs },
         .ktype = &ktype_mci,
 };
 
@@ -1010,6 +1010,7 @@ int edac_sysfs_setup_mc_kset(void)
         }
 
         /* Init the MC's kobject */
+        kobject_set_name(&mc_kset.kobj, "mc");
         mc_kset.kobj.parent = &edac_class->kset.kobj;
 
         /* register the mc_kset */
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index df076064a3e0..a080fedf0332 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -129,17 +129,17 @@ struct kobj_type ktype_dlpar_io = {
 };
 
 struct kset dlpar_io_kset = {
-        .kobj = {.name = DLPAR_KOBJ_NAME,
-                 .ktype = &ktype_dlpar_io,
+        .kobj = {.ktype = &ktype_dlpar_io,
                  .parent = &pci_hotplug_slots_subsys.kobj},
         .ktype = &ktype_dlpar_io,
 };
 
 int dlpar_sysfs_init(void)
 {
+        kobject_set_name(&dlpar_io_kset.kobj, DLPAR_KOBJ_NAME);
         if (kset_register(&dlpar_io_kset)) {
                 printk(KERN_ERR "rpadlpar_io: cannot register kset for %s\n",
-                                dlpar_io_kset.kobj.name);
+                                kobject_name(&dlpar_io_kset.kobj));
                 return -EINVAL;
         }
 
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 1dc72105ab12..f88f88fdedf1 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -167,7 +167,6 @@ static struct kobj_type dlm_ktype = {
 };
 
 static struct kset dlm_kset = {
-        .kobj   = {.name = "dlm",},
         .ktype  = &dlm_ktype,
 };
 
@@ -228,6 +227,7 @@ int dlm_lockspace_init(void)
         INIT_LIST_HEAD(&lslist);
         spin_lock_init(&lslist_lock);
 
+        kobject_set_name(&dlm_kset.kobj, "dlm");
         kobj_set_kset_s(&dlm_kset, kernel_subsys);
         error = kset_register(&dlm_kset);
         if (error)
diff --git a/fs/gfs2/locking/dlm/sysfs.c b/fs/gfs2/locking/dlm/sysfs.c
index d9fe3ca40e18..ae9e6a25fe2b 100644
--- a/fs/gfs2/locking/dlm/sysfs.c
+++ b/fs/gfs2/locking/dlm/sysfs.c
@@ -190,7 +190,6 @@ static struct kobj_type gdlm_ktype = {
 };
 
 static struct kset gdlm_kset = {
-        .kobj   = {.name = "lock_dlm",},
         .ktype  = &gdlm_ktype,
 };
 
@@ -224,6 +223,7 @@ int gdlm_sysfs_init(void)
 {
         int error;
 
+        kobject_set_name(&gdlm_kset.kobj, "lock_dlm");
         kobj_set_kset_s(&gdlm_kset, kernel_subsys);
         error = kset_register(&gdlm_kset);
         if (error)
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index c26c21b53c19..640cb6a6fc4c 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -222,7 +222,6 @@ static struct kobj_type gfs2_ktype = {
 };
 
 static struct kset gfs2_kset = {
-        .kobj   = {.name = "gfs2"},
         .ktype  = &gfs2_ktype,
 };
 
@@ -553,6 +552,7 @@ int gfs2_sys_init(void)
 {
         gfs2_sys_margs = NULL;
         spin_lock_init(&gfs2_sys_margs_lock);
+        kobject_set_name(&gfs2_kset.kobj, "gfs2");
         kobj_set_kset_s(&gfs2_kset, fs_subsys);
         return kset_register(&gfs2_kset);
 }
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index e9e042b93dbf..a4882c8df945 100644
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -143,7 +143,7 @@ static struct kobj_type mlog_ktype = {
 };
 
 static struct kset mlog_kset = {
-        .kobj   = {.name = "logmask", .ktype = &mlog_ktype},
+        .kobj   = {.ktype = &mlog_ktype},
 };
 
 int mlog_sys_init(struct kset *o2cb_subsys)
@@ -156,6 +156,7 @@ int mlog_sys_init(struct kset *o2cb_subsys)
         }
         mlog_attr_ptrs[i] = NULL;
 
+        kobject_set_name(&mlog_kset.kobj, "logmask");
         kobj_set_kset_s(&mlog_kset, *o2cb_subsys);
         return kset_register(&mlog_kset);
 }