Commit 19d3cf9d authored by Yanfei Xu's avatar Yanfei Xu Committed by Linus Torvalds

mm/compaction: rename 'start_pfn' to 'iteration_start_pfn' in compact_zone()

There are two 'start_pfn' declared in compact_zone() which have different
meanings.  Rename the second one to 'iteration_start_pfn' to prevent
confusion.

Also, remove an useless semicolon.

Link: https://lkml.kernel.org/r/20201019115044.1571-1-yanfei.xu@windriver.comSigned-off-by: default avatarYanfei Xu <yanfei.xu@windriver.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarPankaj Gupta <pankaj.gupta.linux@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 135f97fd
...@@ -2275,7 +2275,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) ...@@ -2275,7 +2275,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
while ((ret = compact_finished(cc)) == COMPACT_CONTINUE) { while ((ret = compact_finished(cc)) == COMPACT_CONTINUE) {
int err; int err;
unsigned long start_pfn = cc->migrate_pfn; unsigned long iteration_start_pfn = cc->migrate_pfn;
/* /*
* Avoid multiple rescans which can happen if a page cannot be * Avoid multiple rescans which can happen if a page cannot be
...@@ -2287,7 +2287,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) ...@@ -2287,7 +2287,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
*/ */
cc->rescan = false; cc->rescan = false;
if (pageblock_start_pfn(last_migrated_pfn) == if (pageblock_start_pfn(last_migrated_pfn) ==
pageblock_start_pfn(start_pfn)) { pageblock_start_pfn(iteration_start_pfn)) {
cc->rescan = true; cc->rescan = true;
} }
...@@ -2311,8 +2311,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) ...@@ -2311,8 +2311,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
goto check_drain; goto check_drain;
case ISOLATE_SUCCESS: case ISOLATE_SUCCESS:
update_cached = false; update_cached = false;
last_migrated_pfn = start_pfn; last_migrated_pfn = iteration_start_pfn;
;
} }
err = migrate_pages(&cc->migratepages, compaction_alloc, err = migrate_pages(&cc->migratepages, compaction_alloc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment