diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-12 18:06:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:51:02 -0400 |
commit | 19c38de88a80913351fcacefdb461cc0b585fa87 (patch) | |
tree | 17d2978ce27861926a0d9a3eb49471b9b736f968 /block | |
parent | 5901d0145c6b9e791bacd049eea11c9db9a3006e (diff) |
kobjects: fix up improper use of the kobject name field
A number of different drivers incorrect access the kobject name field
directly. This is not correct as the name might not be in the array.
Use the proper accessor function instead.
Diffstat (limited to 'block')
-rw-r--r-- | block/elevator.c | 2 | ||||
-rw-r--r-- | block/ll_rw_blk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index c6d153de9fd6..b9c518afe1f8 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q, | |||
186 | eq->ops = &e->ops; | 186 | eq->ops = &e->ops; |
187 | eq->elevator_type = e; | 187 | eq->elevator_type = e; |
188 | kobject_init(&eq->kobj); | 188 | kobject_init(&eq->kobj); |
189 | snprintf(eq->kobj.name, KOBJ_NAME_LEN, "%s", "iosched"); | 189 | kobject_set_name(&eq->kobj, "%s", "iosched"); |
190 | eq->kobj.ktype = &elv_ktype; | 190 | eq->kobj.ktype = &elv_ktype; |
191 | mutex_init(&eq->sysfs_lock); | 191 | mutex_init(&eq->sysfs_lock); |
192 | 192 | ||
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index cd9d2c5d91ae..d875673e76cd 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -1854,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) | |||
1854 | 1854 | ||
1855 | init_timer(&q->unplug_timer); | 1855 | init_timer(&q->unplug_timer); |
1856 | 1856 | ||
1857 | snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue"); | 1857 | kobject_set_name(&q->kobj, "%s", "queue"); |
1858 | q->kobj.ktype = &queue_ktype; | 1858 | q->kobj.ktype = &queue_ktype; |
1859 | kobject_init(&q->kobj); | 1859 | kobject_init(&q->kobj); |
1860 | 1860 | ||