summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2018-12-28 03:39:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 15:11:51 -0500
commitab41ee6879981b3d3a16a1079a33fa6fd043eb3c (patch)
treebebba97531700a014e65998d6a275cf8f9fd3d57
parent88dbcbb3a4847f5e6dfeae952d3105497700c128 (diff)
mm: migrate: drop unused argument of migrate_page_move_mapping()
All callers of migrate_page_move_mapping() now pass NULL for 'head' argument. Drop it. Link: http://lkml.kernel.org/r/20181211172143.7358-7-jack@suse.cz Signed-off-by: Jan Kara <jack@suse.cz> Acked-by: Mel Gorman <mgorman@suse.de> Cc: Michal Hocko <mhocko@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/aio.c2
-rw-r--r--fs/f2fs/data.c2
-rw-r--r--fs/iomap.c2
-rw-r--r--fs/ubifs/file.c2
-rw-r--r--include/linux/migrate.h3
-rw-r--r--mm/migrate.c7
6 files changed, 8 insertions, 10 deletions
diff --git a/fs/aio.c b/fs/aio.c
index aac9659381d2..bc401d5bcdc2 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -409,7 +409,7 @@ static int aio_migratepage(struct address_space *mapping, struct page *new,
409 BUG_ON(PageWriteback(old)); 409 BUG_ON(PageWriteback(old));
410 get_page(new); 410 get_page(new);
411 411
412 rc = migrate_page_move_mapping(mapping, new, old, NULL, mode, 1); 412 rc = migrate_page_move_mapping(mapping, new, old, mode, 1);
413 if (rc != MIGRATEPAGE_SUCCESS) { 413 if (rc != MIGRATEPAGE_SUCCESS) {
414 put_page(new); 414 put_page(new);
415 goto out_unlock; 415 goto out_unlock;
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b293cb3e27a2..008b74eff00d 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2738,7 +2738,7 @@ int f2fs_migrate_page(struct address_space *mapping,
2738 */ 2738 */
2739 extra_count = (atomic_written ? 1 : 0) - page_has_private(page); 2739 extra_count = (atomic_written ? 1 : 0) - page_has_private(page);
2740 rc = migrate_page_move_mapping(mapping, newpage, 2740 rc = migrate_page_move_mapping(mapping, newpage,
2741 page, NULL, mode, extra_count); 2741 page, mode, extra_count);
2742 if (rc != MIGRATEPAGE_SUCCESS) { 2742 if (rc != MIGRATEPAGE_SUCCESS) {
2743 if (atomic_written) 2743 if (atomic_written)
2744 mutex_unlock(&fi->inmem_lock); 2744 mutex_unlock(&fi->inmem_lock);
diff --git a/fs/iomap.c b/fs/iomap.c
index ce837d962d47..2d9b93cc4930 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -563,7 +563,7 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage,
563{ 563{
564 int ret; 564 int ret;
565 565
566 ret = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); 566 ret = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
567 if (ret != MIGRATEPAGE_SUCCESS) 567 if (ret != MIGRATEPAGE_SUCCESS)
568 return ret; 568 return ret;
569 569
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 1b78f2e09218..5d2ffb1a45fc 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1481,7 +1481,7 @@ static int ubifs_migrate_page(struct address_space *mapping,
1481{ 1481{
1482 int rc; 1482 int rc;
1483 1483
1484 rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); 1484 rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
1485 if (rc != MIGRATEPAGE_SUCCESS) 1485 if (rc != MIGRATEPAGE_SUCCESS)
1486 return rc; 1486 return rc;
1487 1487
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 617615fa11ce..e13d9bf2f9a5 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -77,8 +77,7 @@ extern void migrate_page_copy(struct page *newpage, struct page *page);
77extern int migrate_huge_page_move_mapping(struct address_space *mapping, 77extern int migrate_huge_page_move_mapping(struct address_space *mapping,
78 struct page *newpage, struct page *page); 78 struct page *newpage, struct page *page);
79extern int migrate_page_move_mapping(struct address_space *mapping, 79extern int migrate_page_move_mapping(struct address_space *mapping,
80 struct page *newpage, struct page *page, 80 struct page *newpage, struct page *page, enum migrate_mode mode,
81 struct buffer_head *head, enum migrate_mode mode,
82 int extra_count); 81 int extra_count);
83#else 82#else
84 83
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 */
401int migrate_page_move_mapping(struct address_space *mapping, 401int 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