| Message ID | 20210325131524.48181-2-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanup and fixup for mm/migrate.c | expand |
On 25.03.21 14:15, Miaohe Lin wrote: > The putback_movable_page() is just called by putback_movable_pages() and > we know the page is locked and both PageMovable() and PageIsolated() is > checked right before calling putback_movable_page(). So we make it static > and remove all the 3 VM_BUG_ON_PAGE(). > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > include/linux/migrate.h | 1 - > mm/migrate.c | 7 +------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/include/linux/migrate.h b/include/linux/migrate.h > index fdf65f23acec..1d8095069b1c 100644 > --- a/include/linux/migrate.h > +++ b/include/linux/migrate.h > @@ -44,7 +44,6 @@ 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 struct page *alloc_migration_target(struct page *page, unsigned long private); > extern int isolate_movable_page(struct page *page, isolate_mode_t mode); > -extern void putback_movable_page(struct page *page); > > extern void migrate_prep(void); > extern void migrate_prep_local(void); > diff --git a/mm/migrate.c b/mm/migrate.c > index 47df0df8f21a..61e7f848b554 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -140,15 +140,10 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) > return -EBUSY; > } > > -/* It should be called on page which is PG_movable */ > -void putback_movable_page(struct page *page) > +static void putback_movable_page(struct page *page) > { > struct address_space *mapping; > > - VM_BUG_ON_PAGE(!PageLocked(page), page); > - VM_BUG_ON_PAGE(!PageMovable(page), page); > - VM_BUG_ON_PAGE(!PageIsolated(page), page); > - > mapping = page_mapping(page); > mapping->a_ops->putback_page(page); > __ClearPageIsolated(page); > Reviewed-by: David Hildenbrand <david@redhat.com>
On Thu, Mar 25, 2021 at 6:16 AM Miaohe Lin <linmiaohe@huawei.com> wrote: > > The putback_movable_page() is just called by putback_movable_pages() and > we know the page is locked and both PageMovable() and PageIsolated() is > checked right before calling putback_movable_page(). So we make it static > and remove all the 3 VM_BUG_ON_PAGE(). Reviewed-by: Yang Shi <shy828301@gmail.com> > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > include/linux/migrate.h | 1 - > mm/migrate.c | 7 +------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/include/linux/migrate.h b/include/linux/migrate.h > index fdf65f23acec..1d8095069b1c 100644 > --- a/include/linux/migrate.h > +++ b/include/linux/migrate.h > @@ -44,7 +44,6 @@ 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 struct page *alloc_migration_target(struct page *page, unsigned long private); > extern int isolate_movable_page(struct page *page, isolate_mode_t mode); > -extern void putback_movable_page(struct page *page); > > extern void migrate_prep(void); > extern void migrate_prep_local(void); > diff --git a/mm/migrate.c b/mm/migrate.c > index 47df0df8f21a..61e7f848b554 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -140,15 +140,10 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) > return -EBUSY; > } > > -/* It should be called on page which is PG_movable */ > -void putback_movable_page(struct page *page) > +static void putback_movable_page(struct page *page) > { > struct address_space *mapping; > > - VM_BUG_ON_PAGE(!PageLocked(page), page); > - VM_BUG_ON_PAGE(!PageMovable(page), page); > - VM_BUG_ON_PAGE(!PageIsolated(page), page); > - > mapping = page_mapping(page); > mapping->a_ops->putback_page(page); > __ClearPageIsolated(page); > -- > 2.19.1 >
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index fdf65f23acec..1d8095069b1c 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -44,7 +44,6 @@ 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 struct page *alloc_migration_target(struct page *page, unsigned long private); extern int isolate_movable_page(struct page *page, isolate_mode_t mode); -extern void putback_movable_page(struct page *page); extern void migrate_prep(void); extern void migrate_prep_local(void); diff --git a/mm/migrate.c b/mm/migrate.c index 47df0df8f21a..61e7f848b554 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -140,15 +140,10 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) return -EBUSY; } -/* It should be called on page which is PG_movable */ -void putback_movable_page(struct page *page) +static void putback_movable_page(struct page *page) { struct address_space *mapping; - VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(!PageMovable(page), page); - VM_BUG_ON_PAGE(!PageIsolated(page), page); - mapping = page_mapping(page); mapping->a_ops->putback_page(page); __ClearPageIsolated(page);
The putback_movable_page() is just called by putback_movable_pages() and we know the page is locked and both PageMovable() and PageIsolated() is checked right before calling putback_movable_page(). So we make it static and remove all the 3 VM_BUG_ON_PAGE(). Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- include/linux/migrate.h | 1 - mm/migrate.c | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-)