Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261439AbUD3KLY (ORCPT ); Fri, 30 Apr 2004 06:11:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262009AbUD3KLX (ORCPT ); Fri, 30 Apr 2004 06:11:23 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.105]:6586 "EHLO e5.ny.us.ibm.com") by vger.kernel.org with ESMTP id S261439AbUD3KLP (ORCPT ); Fri, 30 Apr 2004 06:11:15 -0400 Date: Fri, 30 Apr 2004 15:44:01 +0530 From: Maneesh Soni To: viro@parcelfarce.linux.theplanet.co.uk, Greg KH Cc: Jeff Garzik , LKML Subject: [RFC 1/2] kobject_set_name - error handling Message-ID: <20040430101401.GC25296@in.ibm.com> Reply-To: maneesh@in.ibm.com References: <20040417082206.GM24997@parcelfarce.linux.theplanet.co.uk> <20040420161602.GB9603@kroah.com> <20040421101104.GA7921@in.ibm.com> <20040422213736.GL17014@parcelfarce.linux.theplanet.co.uk> <20040423085218.GB27638@in.ibm.com> <20040423092641.GM17014@parcelfarce.linux.theplanet.co.uk> <20040429130353.GC11624@in.ibm.com> <20040429154104.GI17014@parcelfarce.linux.theplanet.co.uk> <20040430100543.GA25296@in.ibm.com> <20040430101333.GB25296@in.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040430101333.GB25296@in.ibm.com> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2654 Lines: 77 o The following patch cleans up the kobject_set_name() users. Basically checking return code from kobject_set_name(). There can be error returns like -ENOMEM or -EFAULT from kobject_set_name() if the name length exceeds KOBJ_NAME_LEN. drivers/base/bus.c | 12 +++++++++--- drivers/base/sys.c | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff -puN drivers/base/sys.c~kobject_set_name-cleanup-01 drivers/base/sys.c --- linux-2.6.6-rc2-mm2/drivers/base/sys.c~kobject_set_name-cleanup-01 2004-04-30 15:14:03.000000000 +0530 +++ linux-2.6.6-rc2-mm2-maneesh/drivers/base/sys.c 2004-04-30 15:14:03.000000000 +0530 @@ -180,8 +180,11 @@ int sysdev_register(struct sys_device * /* But make sure we point to the right type for sysfs translation */ sysdev->kobj.ktype = &ktype_sysdev; - kobject_set_name(&sysdev->kobj,"%s%d", + error = kobject_set_name(&sysdev->kobj,"%s%d", kobject_name(&cls->kset.kobj),sysdev->id); + if (error) + return error; + pr_debug("Registering sys device '%s'\n",kobject_name(&sysdev->kobj)); /* Register the object */ diff -puN drivers/base/bus.c~kobject_set_name-cleanup-01 drivers/base/bus.c --- linux-2.6.6-rc2-mm2/drivers/base/bus.c~kobject_set_name-cleanup-01 2004-04-30 15:14:03.000000000 +0530 +++ linux-2.6.6-rc2-mm2-maneesh/drivers/base/bus.c 2004-04-30 15:14:03.000000000 +0530 @@ -451,7 +451,9 @@ int bus_add_driver(struct device_driver if (bus) { pr_debug("bus %s: add driver %s\n",bus->name,drv->name); - kobject_set_name(&drv->kobj,drv->name); + error = kobject_set_name(&drv->kobj,drv->name); + if (error) + return error; drv->kobj.kset = &bus->drivers; if ((error = kobject_register(&drv->kobj))) { put_bus(bus); @@ -555,7 +557,11 @@ struct bus_type * find_bus(char * name) */ int bus_register(struct bus_type * bus) { - kobject_set_name(&bus->subsys.kset.kobj,bus->name); + int error = 0; + + error = kobject_set_name(&bus->subsys.kset.kobj,bus->name); + if (error) + return error; subsys_set_kset(bus,bus_subsys); subsystem_register(&bus->subsys); @@ -569,7 +575,7 @@ int bus_register(struct bus_type * bus) kset_register(&bus->drivers); pr_debug("bus type '%s' registered\n",bus->name); - return 0; + return error; } _ -- Maneesh Soni Linux Technology Center, IBM Software Lab, Bangalore, India email: maneesh@in.ibm.com Phone: 91-80-25044999 Fax: 91-80-25268553 T/L : 9243696 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/