diff options
author | Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> | 2012-12-11 19:00:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 20:22:23 -0500 |
commit | 8c7b5b4ed948d1ddf9672ee932a16750b280822a (patch) | |
tree | 2a2a95bda012882549753e1ce1d0de845f5db314 | |
parent | 8732794b166196cc501c2ddd9e7c97cf45ab64c5 (diff) |
memory-hotplug: suppress "Device nodeX does not have a release() function" warning
When calling unregister_node(), the function shows following message at
device_release().
"Device 'node2' does not have a release() function, it is broken and must
be fixed."
The reason is node's device struct does not have a release() function.
So the patch registers node_device_release() to the device's release()
function for suppressing the warning message. Additionally, the patch
adds memset() to initialize a node struct into register_node(). Because
the node struct is part of node_devices[] array and it cannot be freed by
node_device_release(). So if system reuses the node struct, it has a
garbage.
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/base/node.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 28216ce74b3d..4282e82d9f26 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
@@ -252,6 +252,24 @@ static inline void hugetlb_register_node(struct node *node) {} | |||
252 | static inline void hugetlb_unregister_node(struct node *node) {} | 252 | static inline void hugetlb_unregister_node(struct node *node) {} |
253 | #endif | 253 | #endif |
254 | 254 | ||
255 | static void node_device_release(struct device *dev) | ||
256 | { | ||
257 | struct node *node = to_node(dev); | ||
258 | |||
259 | #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS) | ||
260 | /* | ||
261 | * We schedule the work only when a memory section is | ||
262 | * onlined/offlined on this node. When we come here, | ||
263 | * all the memory on this node has been offlined, | ||
264 | * so we won't enqueue new work to this work. | ||
265 | * | ||
266 | * The work is using node->node_work, so we should | ||
267 | * flush work before freeing the memory. | ||
268 | */ | ||
269 | flush_work(&node->node_work); | ||
270 | #endif | ||
271 | kfree(node); | ||
272 | } | ||
255 | 273 | ||
256 | /* | 274 | /* |
257 | * register_node - Setup a sysfs device for a node. | 275 | * register_node - Setup a sysfs device for a node. |
@@ -265,6 +283,7 @@ int register_node(struct node *node, int num, struct node *parent) | |||
265 | 283 | ||
266 | node->dev.id = num; | 284 | node->dev.id = num; |
267 | node->dev.bus = &node_subsys; | 285 | node->dev.bus = &node_subsys; |
286 | node->dev.release = node_device_release; | ||
268 | error = device_register(&node->dev); | 287 | error = device_register(&node->dev); |
269 | 288 | ||
270 | if (!error){ | 289 | if (!error){ |
@@ -586,7 +605,6 @@ int register_one_node(int nid) | |||
586 | void unregister_one_node(int nid) | 605 | void unregister_one_node(int nid) |
587 | { | 606 | { |
588 | unregister_node(node_devices[nid]); | 607 | unregister_node(node_devices[nid]); |
589 | kfree(node_devices[nid]); | ||
590 | node_devices[nid] = NULL; | 608 | node_devices[nid] = NULL; |
591 | } | 609 | } |
592 | 610 | ||