| From ebiederm@xmission.com Fri Apr 6 09:47:44 2007 |
| From: ebiederm@xmission.com (Eric W. Biederman) |
| Date: Fri, 06 Apr 2007 10:47:11 -0600 |
| Subject: kobject: Comment and warning fixes to kobject.c |
| To: Greg Kroah-Hartman <gregkh@suse.de> |
| Cc: Kay Sievers <kay.sievers@vrfy.org>, Linux Containers <containers@lists.osdl.org> |
| Message-ID: <m11wix8n74.fsf@ebiederm.dsl.xmission.com> |
| |
| |
| This dots some i's and crosses some t's after left over from when |
| kobject_kset_add_dir was built from kobject_add_dir. |
| |
| Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> |
| Cc: Kay Sievers <kay.sievers@vrfy.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| lib/kobject.c | 13 ++++++++++--- |
| 1 file changed, 10 insertions(+), 3 deletions(-) |
| |
| --- a/lib/kobject.c |
| +++ b/lib/kobject.c |
| @@ -519,7 +519,7 @@ static struct kobj_type dir_ktype = { |
| }; |
| |
| /** |
| - * kobject__kset_add_dir - add sub directory of object. |
| + * kobject_kset_add_dir - add sub directory of object. |
| * @kset: kset the directory is belongs to. |
| * @parent: object in which a directory is created. |
| * @name: directory name. |
| @@ -545,8 +545,8 @@ struct kobject *kobject_kset_add_dir(str |
| kobject_set_name(k, name); |
| ret = kobject_register(k); |
| if (ret < 0) { |
| - printk(KERN_WARNING "kobject_add_dir: " |
| - "kobject_register error: %d\n", ret); |
| + printk(KERN_WARNING "%s: kobject_register error: %d\n", |
| + __func__, ret); |
| kobject_del(k); |
| return NULL; |
| } |
| @@ -554,6 +554,13 @@ struct kobject *kobject_kset_add_dir(str |
| return k; |
| } |
| |
| +/** |
| + * kobject_add_dir - add sub directory of object. |
| + * @parent: object in which a directory is created. |
| + * @name: directory name. |
| + * |
| + * Add a plain directory object as child of given object. |
| + */ |
| struct kobject *kobject_add_dir(struct kobject *parent, const char *name) |
| { |
| return kobject_kset_add_dir(NULL, parent, name); |