From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1767510AbXDFCuz (ORCPT ); Thu, 5 Apr 2007 22:50:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1767507AbXDFCuz (ORCPT ); Thu, 5 Apr 2007 22:50:55 -0400 Received: from wr-out-0506.google.com ([64.233.184.235]:33275 "EHLO wr-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1767510AbXDFCux (ORCPT ); Thu, 5 Apr 2007 22:50:53 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:date:from:to:cc:subject:message-id:reply-to:mail-followup-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=mGDyVry8JRrtKxyIwjz9odUVEHYr6qWMA4Qqca1NubqbL69jREzLhQN55G31sbrcKSo7+96YQo5pG2nMzsgkANaDs8Ej67bBZ951iHaWTVHuJzZo4KJwi3Ayorf/WcK5jsn6gwIz9OZcyNWkfr7sgtu3JBvaZg2siMhsij7lmY8= Date: Fri, 6 Apr 2007 10:53:43 +0800 From: WANG Cong To: Cornelia Huck Cc: linux-kernel@vger.kernel.org, Andrew Morton , viro@zeniv.linux.org.uk Subject: Re: [-mm3 PATCH] (Retry) Check the return value of kobject_add and etc. Message-ID: <20070406025343.GA2407@localhost.localdomain> Reply-To: WANG Cong Mail-Followup-To: Cornelia Huck , linux-kernel@vger.kernel.org, Andrew Morton , viro@zeniv.linux.org.uk References: <2375c9f90704010032r119f4a1eqb24dd611d5ecd943@mail.gmail.com> <20070402130128.707c8c19@gondolin.boeblingen.de.ibm.com> <20070405045410.GA4692@localhost.localdomain> <20070405111142.4723035f@gondolin.boeblingen.de.ibm.com> <20070405144409.GA5294@localhost.localdomain> <20070405170514.481b765f@gondolin.boeblingen.de.ibm.com> <20070405152732.GA5569@localhost.localdomain> <20070405180016.5099e0cd@gondolin.boeblingen.de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070405180016.5099e0cd@gondolin.boeblingen.de.ibm.com> User-Agent: Mutt/1.4.2.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 05, 2007 at 06:00:16PM +0200, Cornelia Huck wrote: >On Thu, 5 Apr 2007 23:27:32 +0800, >WANG Cong wrote: > >> Thank you very much! I know. So I should replace all kfree with kobject_put, like this one: >> >> - sysfs_create_link(&p->kobj, &block_subsys.kset.kobj, "subsystem"); >> + if (sysfs_create_link(&p->kobj, &block_subsys.kset.kobj, "subsystem")) { >> + kobject_uevent(&p->kobj, KOBJ_REMOVE); >> + kobject_del(&p->kobj); >> + kobject_put(&p->kobj); >> + return; >> + } >> >> Is that all right? >> > >Yes, or use kobject_unregister(). OK. Then I send it again. Hopefully it can be accepted this time. ;-p Signed-off-by: WANG Cong --- --- linux-2.6.21-rc5-mm4/fs/partitions/check.c.orig 2007-04-05 12:48:29.000000000 +0800 +++ linux-2.6.21-rc5-mm4/fs/partitions/check.c 2007-04-05 23:15:41.000000000 +0800 @@ -385,10 +385,18 @@ 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)) { + kobject_put(&p->kobj); + 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")) { + kobject_uevent(&p->kobj, KOBJ_REMOVE); + kobject_del(&p->kobj); + kobject_put(&p->kobj); + return; + } if (flags & ADDPART_FLAG_WHOLEDISK) { static struct attribute addpartattr = { .name = "whole_disk", @@ -396,7 +404,13 @@ void add_partition(struct gendisk *disk, .owner = THIS_MODULE, }; - sysfs_create_file(&p->kobj, &addpartattr); + if (sysfs_create_file(&p->kobj, &addpartattr)) { + sysfs_remove_link(&p->kobj, "subsystem"); + kobject_uevent(&p->kobj, KOBJ_REMOVE); + kobject_del(&p->kobj); + kobject_put(&p->kobj); + return; + } } partition_sysfs_add_subdir(p); disk->part[part-1] = p;