|
@@ -381,10 +381,12 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,
|
|
p->partno = part;
|
|
p->partno = part;
|
|
p->policy = disk->policy;
|
|
p->policy = disk->policy;
|
|
|
|
|
|
- if (isdigit(disk->kobj.name[strlen(disk->kobj.name)-1]))
|
|
|
|
- snprintf(p->kobj.name,KOBJ_NAME_LEN,"%sp%d",disk->kobj.name,part);
|
|
|
|
|
|
+ if (isdigit(disk->kobj.k_name[strlen(disk->kobj.k_name)-1]))
|
|
|
|
+ kobject_set_name(&p->kobj, "%sp%d",
|
|
|
|
+ kobject_name(&disk->kobj), part);
|
|
else
|
|
else
|
|
- snprintf(p->kobj.name,KOBJ_NAME_LEN,"%s%d",disk->kobj.name,part);
|
|
|
|
|
|
+ kobject_set_name(&p->kobj, "%s%d",
|
|
|
|
+ kobject_name(&disk->kobj),part);
|
|
p->kobj.parent = &disk->kobj;
|
|
p->kobj.parent = &disk->kobj;
|
|
p->kobj.ktype = &ktype_part;
|
|
p->kobj.ktype = &ktype_part;
|
|
kobject_init(&p->kobj);
|
|
kobject_init(&p->kobj);
|
|
@@ -477,9 +479,9 @@ void register_disk(struct gendisk *disk)
|
|
struct hd_struct *p;
|
|
struct hd_struct *p;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
- strlcpy(disk->kobj.name,disk->disk_name,KOBJ_NAME_LEN);
|
|
|
|
|
|
+ kobject_set_name(&disk->kobj, "%s", disk->disk_name);
|
|
/* ewww... some of these buggers have / in name... */
|
|
/* ewww... some of these buggers have / in name... */
|
|
- s = strchr(disk->kobj.name, '/');
|
|
|
|
|
|
+ s = strchr(disk->kobj.k_name, '/');
|
|
if (s)
|
|
if (s)
|
|
*s = '!';
|
|
*s = '!';
|
|
if ((err = kobject_add(&disk->kobj)))
|
|
if ((err = kobject_add(&disk->kobj)))
|