The patch titled
Subject: mm: migrate: remove unused mode argument
has been added to the -mm tree. Its filename is
mm-migrate-remove-unused-mode-argument.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-migrate-remove-unused-mode-argument.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-migrate-remove-unused-mode-argument.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: Keith Busch <keith.busch@xxxxxxxxx>
Subject: mm: migrate: remove unused mode argument
migrate_page_move_mapping() doesn't use the mode argument. Remove it and
update callers accordingly.
Link: http://lkml.kernel.org/r/20190508210301.8472-1-keith.busch@xxxxxxxxx
Signed-off-by: Keith Busch <keith.busch@xxxxxxxxx>
Reviewed-by: Zi Yan <ziy@xxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/aio.c | 2 +-
fs/f2fs/data.c | 2 +-
fs/iomap.c | 2 +-
fs/ubifs/file.c | 2 +-
include/linux/migrate.h | 3 +--
mm/migrate.c | 7 +++----
6 files changed, 8 insertions(+), 10 deletions(-)
--- a/fs/aio.c~mm-migrate-remove-unused-mode-argument
+++ a/fs/aio.c
@@ -425,7 +425,7 @@ static int aio_migratepage(struct addres
BUG_ON(PageWriteback(old));
get_page(new);
- rc = migrate_page_move_mapping(mapping, new, old, mode, 1);
+ rc = migrate_page_move_mapping(mapping, new, old, 1);
if (rc != MIGRATEPAGE_SUCCESS) {
put_page(new);
goto out_unlock;
--- a/fs/f2fs/data.c~mm-migrate-remove-unused-mode-argument
+++ a/fs/f2fs/data.c
@@ -2843,7 +2843,7 @@ int f2fs_migrate_page(struct address_spa
/* one extra reference was held for atomic_write page */
extra_count = atomic_written ? 1 : 0;
rc = migrate_page_move_mapping(mapping, newpage,
- page, mode, extra_count);
+ page, extra_count);
if (rc != MIGRATEPAGE_SUCCESS) {
if (atomic_written)
mutex_unlock(&fi->inmem_lock);
--- a/fs/iomap.c~mm-migrate-remove-unused-mode-argument
+++ a/fs/iomap.c
@@ -562,7 +562,7 @@ iomap_migrate_page(struct address_space
{
int ret;
- ret = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
+ ret = migrate_page_move_mapping(mapping, newpage, page, 0);
if (ret != MIGRATEPAGE_SUCCESS)
return ret;
--- a/fs/ubifs/file.c~mm-migrate-remove-unused-mode-argument
+++ a/fs/ubifs/file.c
@@ -1482,7 +1482,7 @@ static int ubifs_migrate_page(struct add
{
int rc;
- rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
+ rc = migrate_page_move_mapping(mapping, newpage, page, 0);
if (rc != MIGRATEPAGE_SUCCESS)
return rc;
--- a/include/linux/migrate.h~mm-migrate-remove-unused-mode-argument
+++ 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, enum migrate_mode mode,
- int extra_count);
+ struct page *newpage, struct page *page, int extra_count);
#else
static inline void putback_movable_pages(struct list_head *l) {}
--- a/mm/migrate.c~mm-migrate-remove-unused-mode-argument
+++ a/mm/migrate.c
@@ -397,8 +397,7 @@ static int expected_page_refs(struct add
* 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, enum migrate_mode mode,
- int extra_count)
+ struct page *newpage, struct page *page, int extra_count)
{
XA_STATE(xas, &mapping->i_pages, page_index(page));
struct zone *oldzone, *newzone;
@@ -684,7 +683,7 @@ int migrate_page(struct address_space *m
BUG_ON(PageWriteback(page)); /* Writeback must be complete */
- rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
+ rc = migrate_page_move_mapping(mapping, newpage, page, 0);
if (rc != MIGRATEPAGE_SUCCESS)
return rc;
@@ -783,7 +782,7 @@ recheck_buffers:
}
}
- rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
+ rc = migrate_page_move_mapping(mapping, newpage, page, 0);
if (rc != MIGRATEPAGE_SUCCESS)
goto unlock_buffers;
_
Patches currently in -mm which might be from keith.busch@xxxxxxxxx are
mm-migrate-remove-unused-mode-argument.patch
