Skip to contentSkip to conversation

mm/hotplug: rename the function is_memblock_offlined_cb()

PATCH In review Xishi Qiu 2 participants 2 messages Sep 6, 2013 – Sep 9, 2013

Subsystems (2)
Memory management Memory hot(un)plug
lore
Share & tools
lore

Xishi Qiu

author
#0 lore raw

PATCH 1/1 mm/hotplug: rename the function is_memblock_offlined_cb()

Function is_memblock_offlined() return 1 means memory block is offlined, but is_memblock_offlined_cb() return 1 means memory block is not offlined, this will confuse somebody, so rename the function.
Another, use "pfn_to_nid(pfn)" instead of "page_to_nid(pfn_to_page(pfn))".

Signed-off-by Xishi Qiu <[email protected]>
---
 mm/memory_hotplug.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
mm/memory_hotplug.c +3 -3
index ca1dd3a..a95dd28 100644
@@ -937,7 +937,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
 	arg.nr_pages = nr_pages;
 	node_states_check_changes_online(nr_pages, zone, &arg);
 
-	nid = page_to_nid(pfn_to_page(pfn));
+	nid = pfn_to_nid(pfn);
 
 	ret = memory_notify(MEM_GOING_ONLINE, &arg);
 	ret = notifier_to_errno(ret);

@@ -1657,7 +1657,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
 }
 
 #ifdef CONFIG_MEMORY_HOTREMOVE
-static int is_memblock_offlined_cb(struct memory_block *mem, void *arg)
+static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
 {
 	int ret = !is_memblock_offlined(mem);
 

@@ -1794,7 +1794,7 @@ void __ref remove_memory(int nid, u64 start, u64 size)
 	 * if this is not the case.
 	 */
 	ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
-				is_memblock_offlined_cb);
+				check_memblock_offlined_cb);
 	if (ret) {
 		unlock_memory_hotplug();
 		BUG();
Signature · 8 lines
1.7.1


--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
#1 lore raw
Quoted 7 lines · Xishi Qiu

Function is_memblock_offlined() return 1 means memory block is offlined, but is_memblock_offlined_cb() return 1 means memory block is not offlined, this will confuse somebody, so rename the function.
Another, use "pfn_to_nid(pfn)" instead of "page_to_nid(pfn_to_page(pfn))".

Signed-off-by Xishi Qiu <[email protected]>

---

It looks good to me. But I have one comment.
Please see below.

Quoted 8 lines
  mm/memory_hotplug.c |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
mm/memory_hotplug.c +0 -0
index ca1dd3a..a95dd28 100644

mm/memory_hotplug.c int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ · line 941

Quoted 6 lines
mm/memory_hotplug.c +1 -1
@@ -937,7 +937,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
  	arg.nr_pages = nr_pages;
  	node_states_check_changes_online(nr_pages, zone, &arg);
 
 
-	nid = page_to_nid(pfn_to_page(pfn));
+	nid = pfn_to_nid(pfn);

Please split the cleanup from this patch since the cleanup has nothing to do with the description of this patch.

Thanks,
Yasuaki Ishimatsu

Quoted 14 lines
mm/memory_hotplug.c +1 -1
  	ret = memory_notify(MEM_GOING_ONLINE, &arg);
  	ret = notifier_to_errno(ret);

@@ -1657,7 +1657,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
  }
 
  #ifdef CONFIG_MEMORY_HOTREMOVE
-static int is_memblock_offlined_cb(struct memory_block *mem, void *arg)
+static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
  {
  	int ret = !is_memblock_offlined(mem);

mm/memory_hotplug.c void __ref remove_memory(int nid, u64 start, u64 size) · line 1800

Quoted 8 lines
mm/memory_hotplug.c +1 -1
@@ -1794,7 +1794,7 @@ void __ref remove_memory(int nid, u64 start, u64 size)
  	 * if this is not the case.
  	 */
  	ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
-				is_memblock_offlined_cb);
+				check_memblock_offlined_cb);
  	if (ret) {
  		unlock_memory_hotplug();
  		BUG();

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>