diff options
Diffstat (limited to 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 8dd57601714f..4389696fba0e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -399,8 +399,7 @@ static int expected_page_refs(struct page *page) | |||
399 | * 3 for pages with a mapping and PagePrivate/PagePrivate2 set. | 399 | * 3 for pages with a mapping and PagePrivate/PagePrivate2 set. |
400 | */ | 400 | */ |
401 | int migrate_page_move_mapping(struct address_space *mapping, | 401 | int migrate_page_move_mapping(struct address_space *mapping, |
402 | struct page *newpage, struct page *page, | 402 | struct page *newpage, struct page *page, enum migrate_mode mode, |
403 | struct buffer_head *head, enum migrate_mode mode, | ||
404 | int extra_count) | 403 | int extra_count) |
405 | { | 404 | { |
406 | XA_STATE(xas, &mapping->i_pages, page_index(page)); | 405 | XA_STATE(xas, &mapping->i_pages, page_index(page)); |
@@ -687,7 +686,7 @@ int migrate_page(struct address_space *mapping, | |||
687 | 686 | ||
688 | BUG_ON(PageWriteback(page)); /* Writeback must be complete */ | 687 | BUG_ON(PageWriteback(page)); /* Writeback must be complete */ |
689 | 688 | ||
690 | rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); | 689 | rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0); |
691 | 690 | ||
692 | if (rc != MIGRATEPAGE_SUCCESS) | 691 | if (rc != MIGRATEPAGE_SUCCESS) |
693 | return rc; | 692 | return rc; |
@@ -790,7 +789,7 @@ recheck_buffers: | |||
790 | } | 789 | } |
791 | } | 790 | } |
792 | 791 | ||
793 | rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); | 792 | rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0); |
794 | if (rc != MIGRATEPAGE_SUCCESS) | 793 | if (rc != MIGRATEPAGE_SUCCESS) |
795 | goto unlock_buffers; | 794 | goto unlock_buffers; |
796 | 795 | ||