* [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine
@ 2007-04-03 17:07 Linas Vepstas
0 siblings, 0 replies; 3+ messages in thread
From: Linas Vepstas @ 2007-04-03 17:07 UTC (permalink / raw)
To: Kristen, Carlson, "Accardi <kristen.c.accardi"
Cc: Andrew Morton, linuxppc-dev, pcihpd-discuss
The routine that called an alloc should be the same routine that
calles the mathcing free, if anything in the middle failed.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
----
drivers/pci/hotplug/rpaphp_core.c | 5 +++++
drivers/pci/hotplug/rpaphp_pci.c | 1 -
drivers/pci/hotplug/rpaphp_slot.c | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_core.c 2007-04-03 11:04:08.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c 2007-04-03 11:04:16.000000000 -0500
@@ -321,10 +321,15 @@ int rpaphp_add_slot(struct device_node *
indexes[i + 1], name, type);
retval = rpaphp_register_pci_slot(slot);
+ if (retval)
+ dealloc_slot_struct(slot);
+
name += strlen(name) + 1;
type += strlen(type) + 1;
}
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
+ /* XXX FIXME: reports a failure only if last entry in loop failed */
return retval;
}
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_slot.c 2007-04-03 11:04:08.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c 2007-04-03 11:04:16.000000000 -0500
@@ -184,7 +184,6 @@ int rpaphp_register_slot(struct slot *sl
sysfs_fail:
pci_hp_deregister(php_slot);
register_fail:
- rpaphp_release_slot(php_slot);
return retval;
}
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_pci.c 2007-04-03 11:00:48.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c 2007-04-03 11:04:16.000000000 -0500
@@ -195,7 +195,6 @@ static int setup_pci_slot(struct slot *s
}
return 0;
exit_rc:
- dealloc_slot_struct(slot);
return -EINVAL;
}
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine
@ 2007-04-03 17:17 Linas Vepstas
0 siblings, 0 replies; 3+ messages in thread
From: Linas Vepstas @ 2007-04-03 17:17 UTC (permalink / raw)
To: Kristen Carlson Accardi; +Cc: Andrew Morton, linuxppc-dev, pcihpd-discuss
The routine that called an alloc should be the same routine that
calles the mathcing free, if anything in the middle failed.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
----
drivers/pci/hotplug/rpaphp_core.c | 5 +++++
drivers/pci/hotplug/rpaphp_pci.c | 1 -
drivers/pci/hotplug/rpaphp_slot.c | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_core.c 2007-04-03 11:04:08.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c 2007-04-03 11:04:16.000000000 -0500
@@ -321,10 +321,15 @@ int rpaphp_add_slot(struct device_node *
indexes[i + 1], name, type);
retval = rpaphp_register_pci_slot(slot);
+ if (retval)
+ dealloc_slot_struct(slot);
+
name += strlen(name) + 1;
type += strlen(type) + 1;
}
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
+ /* XXX FIXME: reports a failure only if last entry in loop failed */
return retval;
}
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_slot.c 2007-04-03 11:04:08.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c 2007-04-03 11:04:16.000000000 -0500
@@ -184,7 +184,6 @@ int rpaphp_register_slot(struct slot *sl
sysfs_fail:
pci_hp_deregister(php_slot);
register_fail:
- rpaphp_release_slot(php_slot);
return retval;
}
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_pci.c 2007-04-03 11:00:48.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c 2007-04-03 11:04:16.000000000 -0500
@@ -195,7 +195,6 @@ static int setup_pci_slot(struct slot *s
}
return 0;
exit_rc:
- dealloc_slot_struct(slot);
return -EINVAL;
}
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 0/19]: RPAPHP pci hotplug cleanup patchbomb
@ 2007-04-03 0:26 Linas Vepstas
2007-04-03 0:35 ` [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine Linas Vepstas
0 siblings, 1 reply; 3+ messages in thread
From: Linas Vepstas @ 2007-04-03 0:26 UTC (permalink / raw)
To: Greg KH; +Cc: Andrew Morton, linuxppc-dev, linux-pci
Hi Greg,
Please queue these cleanp patches for 2.6.22; cc'ing akpm.
This is a collection of very small patches that clean up various bits and
pieces of the RPAPHP hotplug code. They eliminate about 100 lines of code,
almost without changing any function; there are a few minor bugfixes to
various error paths, and one memleak fix. Some documentation is added.
The result is, I beleive, slightly more readable, easier to understand
code. In particular, the enable/disable add/remove code paths are now
more obviously symmetrical in thier function.
--linas
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine
2007-04-03 0:26 [PATCH 0/19]: RPAPHP pci hotplug cleanup patchbomb Linas Vepstas
@ 2007-04-03 0:35 ` Linas Vepstas
0 siblings, 0 replies; 3+ messages in thread
From: Linas Vepstas @ 2007-04-03 0:35 UTC (permalink / raw)
To: Greg KH; +Cc: Andrew Morton, linuxppc-dev, linux-pci
The routine that called an alloc should be the same routine that
calles the mathcing free, if anything in the middle failed.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
----
drivers/pci/hotplug/rpaphp_core.c | 5 +++++
drivers/pci/hotplug/rpaphp_pci.c | 1 -
drivers/pci/hotplug/rpaphp_slot.c | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_core.c 2007-03-28 17:42:01.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c 2007-03-28 17:42:04.000000000 -0500
@@ -321,10 +321,15 @@ int rpaphp_add_slot(struct device_node *
indexes[i + 1], name, type);
retval = rpaphp_register_pci_slot(slot);
+ if (retval)
+ dealloc_slot_struct(slot);
+
name += strlen(name) + 1;
type += strlen(type) + 1;
}
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
+ /* XXX FIXME: reports a failure only if last entry in loop failed */
return retval;
}
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_slot.c 2007-03-28 17:42:01.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c 2007-03-28 17:42:04.000000000 -0500
@@ -184,7 +184,6 @@ int rpaphp_register_slot(struct slot *sl
sysfs_fail:
pci_hp_deregister(php_slot);
register_fail:
- rpaphp_release_slot(php_slot);
return retval;
}
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_pci.c 2007-03-28 17:42:01.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c 2007-03-28 17:42:04.000000000 -0500
@@ -195,7 +195,6 @@ static int setup_pci_slot(struct slot *s
}
return 0;
exit_rc:
- dealloc_slot_struct(slot);
return -EINVAL;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-04-03 17:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-03 17:07 [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine Linas Vepstas
-- strict thread matches above, loose matches on Subject: below --
2007-04-03 17:17 Linas Vepstas
2007-04-03 0:26 [PATCH 0/19]: RPAPHP pci hotplug cleanup patchbomb Linas Vepstas
2007-04-03 0:35 ` [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine Linas Vepstas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).