From: Eugene Teo <eugeneteo@kernel.sg>
To: linux-kernel@vger.kernel.org
Cc: cornelia.huck@de.ibm.com
Subject: [PATCH] fs/partitions/check.c: add_partition() warning fixes (take 4)
Date: Mon, 30 Jul 2007 19:38:47 +0800 [thread overview]
Message-ID: <20070730113847.GA28404@kernel.sg> (raw)
This patch fixes these warnings:
fs/partitions/check.c: In function 'add_partition':
fs/partitions/check.c:391: warning: ignoring return value of 'kobject_add',
declared with attribute warn_unused_result
fs/partitions/check.c:394: warning: ignoring return value of
'sysfs_create_link', declared with attribute warn_unused_result
fs/partitions/check.c:401: warning: ignoring return value of
'sysfs_create_file', declared with attribute warn_unused_result
Got it right this time. Thanks Cornelia for help.
Signed-off-by: Eugene Teo <eugeneteo@kernel.sg>
---
fs/partitions/check.c | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 783c57e..bc69f81 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -371,6 +371,7 @@ void delete_partition(struct gendisk *disk, int part)
void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len, int flags)
{
struct hd_struct *p;
+ int err;
p = kzalloc(sizeof(*p), GFP_KERNEL);
if (!p)
@@ -388,20 +389,36 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,
p->kobj.parent = &disk->kobj;
p->kobj.ktype = &ktype_part;
kobject_init(&p->kobj);
- kobject_add(&p->kobj);
+ err = kobject_add(&p->kobj);
+ if (err)
+ goto err_out;
if (!disk->part_uevent_suppress)
kobject_uevent(&p->kobj, KOBJ_ADD);
- sysfs_create_link(&p->kobj, &block_subsys.kobj, "subsystem");
+ err = sysfs_create_link(&p->kobj, &block_subsys.kobj, "subsystem");
+ if (err)
+ goto err_out_del_kobj;
if (flags & ADDPART_FLAG_WHOLEDISK) {
static struct attribute addpartattr = {
.name = "whole_disk",
.mode = S_IRUSR | S_IRGRP | S_IROTH,
};
- sysfs_create_file(&p->kobj, &addpartattr);
+ err = sysfs_create_file(&p->kobj, &addpartattr);
+ if (err)
+ goto err_out_del_link;
}
partition_sysfs_add_subdir(p);
disk->part[part-1] = p;
+ return;
+
+err_out_del_link:
+ sysfs_remove_link(&p->kobj, "subsystem");
+err_out_del_kobj:
+ if (!disk->part_uevent_suppress)
+ kobject_uevent(&p->kobj, KOBJ_REMOVE);
+ kobject_del(&p->kobj);
+err_out:
+ kobject_put(&p->kobj);
}
static char *make_block_name(struct gendisk *disk)
next reply other threads:[~2007-07-30 11:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-30 11:38 Eugene Teo [this message]
2007-07-30 12:11 ` [PATCH] fs/partitions/check.c: add_partition() warning fixes (take 4) Cornelia Huck
2007-07-31 11:50 ` WANG Cong
2007-07-31 12:19 ` Cornelia Huck
2007-07-31 13:08 ` WANG Cong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070730113847.GA28404@kernel.sg \
--to=eugeneteo@kernel.sg \
--cc=cornelia.huck@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox