Thread (5 messages) flat view 5 messages, 2 authors, 2011-08-10

Re: [PATCH 1/3] powerpc: numa: Remove double of_node_put in hot_add_node_scn_to_nid

From: Stephen Rothwell <hidden>
Date: 2011-08-10 08:33:37

Hi Anton,

On Wed, 10 Aug 2011 16:49:34 +1000 Anton Blanchard [off-list ref] wrote:
During memory hotplug testing, I got the following warning:


ERROR: Bad of_node_put() on /memory@0

of_find_node_by_type() loop does of_node_put for us so remove the
duplicate one inside the loop.
But does an of_node_get() on its return value ..
quoted hunk ↗ jump to hunk
Signed-off-by: Anton Blanchard <redacted>
Cc: stable@kernel.org
---

Index: linux-powerpc/arch/powerpc/mm/numa.c
===================================================================
--- linux-powerpc.orig/arch/powerpc/mm/numa.c	2011-06-06 08:07:35.148708089 +1000
+++ linux-powerpc/arch/powerpc/mm/numa.c	2011-08-10 11:31:59.723379868 +1000
@@ -1214,7 +1214,6 @@ int hot_add_node_scn_to_nid(unsigned lon
 			break;
 		}
 
-		of_node_put(memory);
 		if (nid >= 0)
 			break;
 	}
Won't that need an of_node_put(memory) after the loop if (nid >= 0) ?  In
fact you should be able to just move the of_node_put(memory) to after the
loop since of_node_put(NULL) is fine.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help