Change the return type of isolate_movable_page() from bool to int.  It
will return 0 when isolate movable page successfully, and return -EBUSY
when it isolates failed.

There is no functional change within this patch but prepare for later
patch.

Signed-off-by: Yisheng Xie <xieyishe...@huawei.com>
Suggested-by: Michal Hocko <mho...@kernel.org>
Suggested-by: Minchan Kim <minc...@kernel.org>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Hanjun Guo <guohan...@huawei.com>
Cc: Johannes Weiner <han...@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo....@lge.com>
Cc: Mel Gorman <mgor...@techsingularity.net>
Cc: Naoya Horiguchi <n-horigu...@ah.jp.nec.com>
Cc: Reza Arbab <ar...@linux.vnet.ibm.com>
Cc: Taku Izumi <izumi.t...@jp.fujitsu.com>
Cc: Vitaly Kuznetsov <vkuzn...@redhat.com>
Cc: Vlastimil Babka <vba...@suse.cz>
Cc: Xishi Qiu <qiuxi...@huawei.com>
---
 include/linux/migrate.h | 2 +-
 mm/compaction.c         | 2 +-
 mm/migrate.c            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index ae8d475..43d5deb 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -37,7 +37,7 @@ extern int migrate_page(struct address_space *,
                        struct page *, struct page *, enum migrate_mode);
 extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free,
                unsigned long private, enum migrate_mode mode, int reason);
-extern bool isolate_movable_page(struct page *page, isolate_mode_t mode);
+extern int isolate_movable_page(struct page *page, isolate_mode_t mode);
 extern void putback_movable_page(struct page *page);
 
 extern int migrate_prep(void);
diff --git a/mm/compaction.c b/mm/compaction.c
index 949198d..1d89147 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -802,7 +802,7 @@ static bool too_many_isolated(struct zone *zone)
                                        locked = false;
                                }
 
-                               if (isolate_movable_page(page, isolate_mode))
+                               if (!isolate_movable_page(page, isolate_mode))
                                        goto isolate_success;
                        }
 
diff --git a/mm/migrate.c b/mm/migrate.c
index 87f4d0f..6807174 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -74,7 +74,7 @@ int migrate_prep_local(void)
        return 0;
 }
 
-bool isolate_movable_page(struct page *page, isolate_mode_t mode)
+int isolate_movable_page(struct page *page, isolate_mode_t mode)
 {
        struct address_space *mapping;
 
@@ -125,14 +125,14 @@ bool isolate_movable_page(struct page *page, 
isolate_mode_t mode)
        __SetPageIsolated(page);
        unlock_page(page);
 
-       return true;
+       return 0;
 
 out_no_isolated:
        unlock_page(page);
 out_putpage:
        put_page(page);
 out:
-       return false;
+       return -EBUSY;
 }
 
 /* It should be called on page which is PG_movable */
-- 
1.7.12.4

Reply via email to