p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mm/ksm.c: use list_for_each_entry_safe 

Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Geliang Tang 2016-01-14 15:20:54 -08:00 committed by Linus Torvalds
parent c8ad6302c2
commit 036404183e
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mm/ksm.c
View File

@ -740,8 +740,7 @@ static int remove_stable_node(struct stable_node *stable_node)
static int remove_all_stable_nodes(void) static int remove_all_stable_nodes(void)
{ {
struct stable_node *stable_node; struct stable_node *stable_node, *next;
struct list_head *this, *next;
int nid; int nid;
int err = 0; int err = 0;
@ -756,8 +755,7 @@ static int remove_all_stable_nodes(void)
cond_resched(); cond_resched();
} }
} }
list_for_each_safe(this, next, &migrate_nodes) { list_for_each_entry_safe(stable_node, next, &migrate_nodes, list) {
stable_node = list_entry(this, struct stable_node, list);
if (remove_stable_node(stable_node)) if (remove_stable_node(stable_node))
err = -EBUSY; err = -EBUSY;
cond_resched(); cond_resched();
@ -1583,13 +1581,11 @@ static struct rmap_item *scan_get_next_rmap_item(struct page **page)
* so prune them once before each full scan. * so prune them once before each full scan.
*/ */
if (!ksm_merge_across_nodes) { if (!ksm_merge_across_nodes) {
struct stable_node *stable_node; struct stable_node *stable_node, *next;
struct list_head *this, *next;
struct page *page; struct page *page;
list_for_each_safe(this, next, &migrate_nodes) { list_for_each_entry_safe(stable_node, next,
stable_node = list_entry(this, &migrate_nodes, list) {
struct stable_node, list);
page = get_ksm_page(stable_node, false); page = get_ksm_page(stable_node, false);
if (page) if (page)
put_page(page); put_page(page);
@ -2012,8 +2008,7 @@ static void wait_while_offlining(void)
static void ksm_check_stable_tree(unsigned long start_pfn, static void ksm_check_stable_tree(unsigned long start_pfn,
unsigned long end_pfn) unsigned long end_pfn)
{ {
struct stable_node *stable_node; struct stable_node *stable_node, *next;
struct list_head *this, *next;
struct rb_node *node; struct rb_node *node;
int nid; int nid;
@ -2034,8 +2029,7 @@ static void ksm_check_stable_tree(unsigned long start_pfn,
cond_resched(); cond_resched();
} }
} }
list_for_each_safe(this, next, &migrate_nodes) { list_for_each_entry_safe(stable_node, next, &migrate_nodes, list) {
stable_node = list_entry(this, struct stable_node, list);
if (stable_node->kpfn >= start_pfn && if (stable_node->kpfn >= start_pfn &&
stable_node->kpfn < end_pfn) stable_node->kpfn < end_pfn)
remove_node_from_stable_tree(stable_node); remove_node_from_stable_tree(stable_node);