The patch titled
Subject: mm: migrate: drop unused argument of migrate_page_move_mapping()
has been added to the -mm tree. Its filename is
mm-migrate-drop-unused-argument-of-migrate_page_move_mapping.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-migrate-drop-unused-argument-of-migrate_page_move_mapping.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-migrate-drop-unused-argument-of-migrate_page_move_mapping.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Jan Kara <jack@xxxxxxx>
Subject: 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@xxxxxxx
Signed-off-by: Jan Kara <jack@xxxxxxx>
Acked-by: Mel Gorman <mgorman@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/fs/aio.c~mm-migrate-drop-unused-argument-of-migrate_page_move_mapping
+++ a/fs/aio.c
@@ -408,7 +408,7 @@ static int aio_migratepage(struct addres
BUG_ON(PageWriteback(old));
get_page(new);
- rc = migrate_page_move_mapping(mapping, new, old, NULL, mode, 1);
+ rc = migrate_page_move_mapping(mapping, new, old, mode, 1);
if (rc != MIGRATEPAGE_SUCCESS) {
put_page(new);
goto out_unlock;
--- a/fs/f2fs/data.c~mm-migrate-drop-unused-argument-of-migrate_page_move_mapping
+++ a/fs/f2fs/data.c
@@ -2738,7 +2738,7 @@ int f2fs_migrate_page(struct address_spa
*/
extra_count = (atomic_written ? 1 : 0) - page_has_private(page);
rc = migrate_page_move_mapping(mapping, newpage,
- page, NULL, mode, extra_count);
+ page, mode, extra_count);
if (rc != MIGRATEPAGE_SUCCESS) {
if (atomic_written)
mutex_unlock(&fi->inmem_lock);
--- a/fs/iomap.c~mm-migrate-drop-unused-argument-of-migrate_page_move_mapping
+++ a/fs/iomap.c
@@ -557,7 +557,7 @@ iomap_migrate_page(struct address_space
{
int ret;
- ret = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0);
+ ret = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
if (ret != MIGRATEPAGE_SUCCESS)
return ret;
--- a/fs/ubifs/file.c~mm-migrate-drop-unused-argument-of-migrate_page_move_mapping
+++ a/fs/ubifs/file.c
@@ -1481,7 +1481,7 @@ static int ubifs_migrate_page(struct add
{
int rc;
- rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0);
+ rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
if (rc != MIGRATEPAGE_SUCCESS)
return rc;
--- a/include/linux/migrate.h~mm-migrate-drop-unused-argument-of-migrate_page_move_mapping
+++ a/include/linux/migrate.h
@@ -77,8 +77,7 @@ extern void migrate_page_copy(struct pag
extern int migrate_huge_page_move_mapping(struct address_space *mapping,
struct page *newpage, struct page *page);
extern int migrate_page_move_mapping(struct address_space *mapping,
- struct page *newpage, struct page *page,
- struct buffer_head *head, enum migrate_mode mode,
+ struct page *newpage, struct page *page, enum migrate_mode mode,
int extra_count);
#else
--- a/mm/migrate.c~mm-migrate-drop-unused-argument-of-migrate_page_move_mapping
+++ a/mm/migrate.c
@@ -399,8 +399,7 @@ static int expected_page_refs(struct pag
* 3 for pages with a mapping and PagePrivate/PagePrivate2 set.
*/
int migrate_page_move_mapping(struct address_space *mapping,
- struct page *newpage, struct page *page,
- struct buffer_head *head, enum migrate_mode mode,
+ struct page *newpage, struct page *page, enum migrate_mode mode,
int extra_count)
{
XA_STATE(xas, &mapping->i_pages, page_index(page));
@@ -687,7 +686,7 @@ int migrate_page(struct address_space *m
BUG_ON(PageWriteback(page)); /* Writeback must be complete */
- rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0);
+ rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
if (rc != MIGRATEPAGE_SUCCESS)
return rc;
@@ -790,7 +789,7 @@ recheck_buffers:
}
}
- rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0);
+ rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
if (rc != MIGRATEPAGE_SUCCESS)
goto unlock_buffers;
_
Patches currently in -mm which might be from jack@xxxxxxx are
mm-migration-factor-out-code-to-compute-expected-number-of-page-references.patch
mm-migrate-lock-buffers-before-migrate_page_move_mapping.patch
mm-migrate-move-migrate_page_lock_buffers.patch
mm-migrate-provide-buffer_migrate_page_norefs.patch
blkdev-avoid-migration-stalls-for-blkdev-pages.patch
mm-migrate-drop-unused-argument-of-migrate_page_move_mapping.patch
