* [PATCH] ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails @ 2009-07-24 9:20 ` Xiaotian Feng 0 siblings, 0 replies; 4+ messages in thread From: Xiaotian Feng @ 2009-07-24 9:20 UTC (permalink / raw) To: tony.luck, fenghua.yu; +Cc: linux-ia64, linux-kernel, Xiaotian Feng make cache_add_dev exit sysfs when kobject_init_and_add returns an error. Signed-off-by: Xiaotian Feng <dfeng@redhat.com> --- arch/ia64/kernel/topology.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index bc80dff..82c5a8f 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, &cache_ktype_percpu_entry, &sys_dev->kobj, "%s", "cache"); + if (retval < 0) { + cpu_cache_sysfs_exit(cpu); + return retval; + } for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { this_object = LEAF_KOBJECT_PTR(cpu,i); -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails @ 2009-07-24 9:20 ` Xiaotian Feng 0 siblings, 0 replies; 4+ messages in thread From: Xiaotian Feng @ 2009-07-24 9:20 UTC (permalink / raw) To: tony.luck, fenghua.yu; +Cc: linux-ia64, linux-kernel, Xiaotian Feng make cache_add_dev exit sysfs when kobject_init_and_add returns an error. Signed-off-by: Xiaotian Feng <dfeng@redhat.com> --- arch/ia64/kernel/topology.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index bc80dff..82c5a8f 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, &cache_ktype_percpu_entry, &sys_dev->kobj, "%s", "cache"); + if (retval < 0) { + cpu_cache_sysfs_exit(cpu); + return retval; + } for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { this_object = LEAF_KOBJECT_PTR(cpu,i); -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails 2009-07-24 9:20 ` Xiaotian Feng @ 2009-07-24 17:40 ` Fenghua Yu -1 siblings, 0 replies; 4+ messages in thread From: Fenghua Yu @ 2009-07-24 17:40 UTC (permalink / raw) To: Xiaotian Feng Cc: Luck, Tony, Yu, Fenghua, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org On Fri, Jul 24, 2009 at 02:20:28AM -0700, Xiaotian Feng wrote: > make cache_add_dev exit sysfs when kobject_init_and_add returns an > error. > > Signed-off-by: Xiaotian Feng <dfeng@redhat.com> > --- > arch/ia64/kernel/topology.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c > index bc80dff..82c5a8f 100644 > --- a/arch/ia64/kernel/topology.c > +++ b/arch/ia64/kernel/topology.c > @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) > retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, > &cache_ktype_percpu_entry, &sys_dev->kobj, > "%s", "cache"); > + if (retval < 0) { > + cpu_cache_sysfs_exit(cpu); > + return retval; > + } > > for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { > this_object = LEAF_KOBJECT_PTR(cpu,i); I add another related failure handling change on top of your patch. Without the change, kobject_uevent(&all_cpu_cache_info[cpu].kobj, KOBJ_ADD) is still executed even when previous kobject_init_adn_add failure. Signed-off-by: Xiaotian Feng <dfeng@redhat.com> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> --- arch/ia64/kernel/topology.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index bc80dff..8f06035 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, &cache_ktype_percpu_entry, &sys_dev->kobj, "%s", "cache"); + if (unlikely(retval < 0)) { + cpu_cache_sysfs_exit(cpu); + return retval; + } for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { this_object = LEAF_KOBJECT_PTR(cpu,i); @@ -385,7 +389,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) } kobject_put(&all_cpu_cache_info[cpu].kobj); cpu_cache_sysfs_exit(cpu); - break; + return retval; } kobject_uevent(&(this_object->kobj), KOBJ_ADD); } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails @ 2009-07-24 17:40 ` Fenghua Yu 0 siblings, 0 replies; 4+ messages in thread From: Fenghua Yu @ 2009-07-24 17:40 UTC (permalink / raw) To: Xiaotian Feng Cc: Luck, Tony, Yu, Fenghua, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org On Fri, Jul 24, 2009 at 02:20:28AM -0700, Xiaotian Feng wrote: > make cache_add_dev exit sysfs when kobject_init_and_add returns an > error. > > Signed-off-by: Xiaotian Feng <dfeng@redhat.com> > --- > arch/ia64/kernel/topology.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c > index bc80dff..82c5a8f 100644 > --- a/arch/ia64/kernel/topology.c > +++ b/arch/ia64/kernel/topology.c > @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) > retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, > &cache_ktype_percpu_entry, &sys_dev->kobj, > "%s", "cache"); > + if (retval < 0) { > + cpu_cache_sysfs_exit(cpu); > + return retval; > + } > > for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { > this_object = LEAF_KOBJECT_PTR(cpu,i); I add another related failure handling change on top of your patch. Without the change, kobject_uevent(&all_cpu_cache_info[cpu].kobj, KOBJ_ADD) is still executed even when previous kobject_init_adn_add failure. Signed-off-by: Xiaotian Feng <dfeng@redhat.com> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> --- arch/ia64/kernel/topology.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index bc80dff..8f06035 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, &cache_ktype_percpu_entry, &sys_dev->kobj, "%s", "cache"); + if (unlikely(retval < 0)) { + cpu_cache_sysfs_exit(cpu); + return retval; + } for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { this_object = LEAF_KOBJECT_PTR(cpu,i); @@ -385,7 +389,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) } kobject_put(&all_cpu_cache_info[cpu].kobj); cpu_cache_sysfs_exit(cpu); - break; + return retval; } kobject_uevent(&(this_object->kobj), KOBJ_ADD); } ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-24 17:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-07-24 9:20 [PATCH] ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails Xiaotian Feng 2009-07-24 9:20 ` Xiaotian Feng 2009-07-24 17:40 ` Fenghua Yu 2009-07-24 17:40 ` Fenghua Yu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.