From: Yang Shi <shy828301@gmail.com>
To: mhocko@suse.com, ziy@nvidia.com, songliubraving@fb.com,
mgorman@suse.de, jack@suse.cz, akpm@linux-foundation.org
Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] mm: migrate: clean up migrate_prep{_local}
Date: Tue, 3 Nov 2020 05:03:33 -0800 [thread overview]
Message-ID: <20201103130334.13468-5-shy828301@gmail.com> (raw)
In-Reply-To: <20201103130334.13468-1-shy828301@gmail.com>
The migrate_prep{_local} never fails, so it is pointless to have return
value and check the return value.
Signed-off-by: Yang Shi <shy828301@gmail.com>
---
include/linux/migrate.h | 4 ++--
mm/mempolicy.c | 8 ++------
mm/migrate.c | 8 ++------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 0f8d1583fa8e..4594838a0f7c 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -45,8 +45,8 @@ extern struct page *alloc_migration_target(struct page *page, unsigned long priv
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);
-extern int migrate_prep_local(void);
+extern void migrate_prep(void);
+extern void migrate_prep_local(void);
extern void migrate_page_states(struct page *newpage, struct page *page);
extern void migrate_page_copy(struct page *newpage, struct page *page);
extern int migrate_huge_page_move_mapping(struct address_space *mapping,
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 3fde772ef5ef..780861312008 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1114,9 +1114,7 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
int err;
nodemask_t tmp;
- err = migrate_prep();
- if (err)
- return err;
+ migrate_prep();
mmap_read_lock(mm);
@@ -1315,9 +1313,7 @@ static long do_mbind(unsigned long start, unsigned long len,
if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) {
- err = migrate_prep();
- if (err)
- goto mpol_out;
+ migrate_prep();
}
{
NODEMASK_SCRATCH(scratch);
diff --git a/mm/migrate.c b/mm/migrate.c
index 9a32bb128f31..8f6a61c9274b 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -62,7 +62,7 @@
* to be migrated using isolate_lru_page(). If scheduling work on other CPUs is
* undesirable, use migrate_prep_local()
*/
-int migrate_prep(void)
+void migrate_prep(void)
{
/*
* Clear the LRU lists so pages can be isolated.
@@ -71,16 +71,12 @@ int migrate_prep(void)
* pages that may be busy.
*/
lru_add_drain_all();
-
- return 0;
}
/* Do the necessary work of migrate_prep but not if it involves other CPUs */
-int migrate_prep_local(void)
+void migrate_prep_local(void)
{
lru_add_drain();
-
- return 0;
}
int isolate_movable_page(struct page *page, isolate_mode_t mode)
--
2.26.2
next prev parent reply other threads:[~2020-11-05 20:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 13:03 [PATCH 0/5] mm: misc migrate cleanup and improvement Yang Shi
2020-11-03 13:03 ` [PATCH 1/5] mm: truncate_complete_page is not existed anymore Yang Shi
2020-11-06 9:16 ` Jan Kara
2020-11-03 13:03 ` [PATCH 2/5] mm: migrate: simplify the logic for handling permanent failure Yang Shi
2020-11-06 20:03 ` Zi Yan
2020-11-06 21:34 ` Yang Shi
2020-11-03 13:03 ` [PATCH 3/5] mm: migrate: skip shared exec THP for NUMA balancing Yang Shi
2020-11-03 13:03 ` Yang Shi [this message]
2020-11-06 20:05 ` [PATCH 4/5] mm: migrate: clean up migrate_prep{_local} Zi Yan
2020-11-03 13:03 ` [PATCH 5/5] mm: migrate: return -ENOSYS if THP migration is unsupported Yang Shi
2020-11-06 20:17 ` Zi Yan
2020-11-06 21:53 ` Yang Shi
2020-11-06 22:02 ` Yang Shi
2020-11-06 23:15 ` Yang Shi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201103130334.13468-5-shy828301@gmail.com \
--to=shy828301@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=songliubraving@fb.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).