[-mm3 patch]Warning fix: check the return value of kobject_add etc.
- From: "Cong WANG" <xiyou.wangcong@xxxxxxxxx>
- Date: Sat, 31 Mar 2007 10:30:31 +0800
Since kobject_add, sysfs_create_link and sysfs_create_file are marked
as '__must_check', so we must always check their return values, or gcc
will give us warnings.
Signed-off-by: Cong WANG <xiyou.wangcong@xxxxxxxxx>
---
--- fs/partitions/check.c.orig 2007-03-30 21:35:45.000000000 +0800
+++ fs/partitions/check.c 2007-03-30 21:49:53.000000000 +0800
@@ -385,10 +385,16 @@ void add_partition(struct gendisk *disk,
p->kobj.parent = &disk->kobj;
p->kobj.ktype = &ktype_part;
kobject_init(&p->kobj);
- kobject_add(&p->kobj);
+ if (kobject_add(&p->kobj)) {
+ kfree(p);
+ return;
+ }
if (!disk->part_uevent_suppress)
kobject_uevent(&p->kobj, KOBJ_ADD);
- sysfs_create_link(&p->kobj, &block_subsys.kset.kobj, "subsystem");
+ if (sysfs_create_link(&p->kobj, &block_subsys.kset.kobj, "subsystem")) {
+ kfree(p);
+ return;
+ }
if (flags & ADDPART_FLAG_WHOLEDISK) {
static struct attribute addpartattr = {
.name = "whole_disk",
@@ -396,7 +402,10 @@ void add_partition(struct gendisk *disk,
.owner = THIS_MODULE,
};
- sysfs_create_file(&p->kobj, &addpartattr);
+ if (sysfs_create_file(&p->kobj, &addpartattr)) {
+ kfree(p);
+ return;
+ }
}
partition_sysfs_add_subdir(p);
disk->part[part-1] = p;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Prev by Date: Re: [patch 1/13] signal/timer/event fds v8 - anonymous inode source ...
- Next by Date: Re: [patch 32/37] CRYPTO: api: scatterwalk_copychunks() fails to advance through scatterlist
- Previous by thread: [PATCH] [PATCH] uml: fix static linking for real
- Next by thread: [powerpc] RS/6000 43p-150 no longer boots as of 2.6.18
- Index(es):
Relevant Pages
- Re: [-mm3 PATCH] (Retry) Check the return value of kobject_add and etc.
... if (flags & ADDPART_FLAG_WHOLEDISK) { ... static struct attribute addpartattr
= { ... The code duplication is unpleasing. ... (Linux-Kernel) - [-mm3 PATCH] (Retry) Check the return value of kobject_add and etc.
... if (flags & ADDPART_FLAG_WHOLEDISK) { ... static struct attribute addpartattr
= { ... .owner = THIS_MODULE, ... (Linux-Kernel) - Re: [-mm3 patch]Warning fix: check the return value of kobject_add etc.
... will give us warnings. ... static struct attribute addpartattr
= { ... Well yes, but the point here it to fix kernel bugs, not to just make the ...
(Linux-Kernel) - Re: [PATCH] fs/partitions/check.c: add_partition() warning fixes
... if (flags & ADDPART_FLAG_WHOLEDISK) { ... static struct attribute addpartattr
= { ... You need a remove uevent if you did an add uevent above. ... (Linux-Kernel) - [PATCH 5/5] reiserfs: cleaning up const checks
... * If flags allow, the tree to the directory may be created. ... static struct
dentry * ... -open_xa_dir (const struct inode *inode, int flags) ...
(Linux-Kernel)