mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-19 21:44:08 +00:00
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>
This commit is contained in:
parent
88dbcbb3a4
commit
ab41ee6879
6 changed files with 8 additions and 10 deletions
2
fs/aio.c
2
fs/aio.c
|
@ -409,7 +409,7 @@ static int aio_migratepage(struct address_space *mapping, struct page *new,
|
||||||
BUG_ON(PageWriteback(old));
|
BUG_ON(PageWriteback(old));
|
||||||
get_page(new);
|
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) {
|
if (rc != MIGRATEPAGE_SUCCESS) {
|
||||||
put_page(new);
|
put_page(new);
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
|
|
|
@ -2738,7 +2738,7 @@ int f2fs_migrate_page(struct address_space *mapping,
|
||||||
*/
|
*/
|
||||||
extra_count = (atomic_written ? 1 : 0) - page_has_private(page);
|
extra_count = (atomic_written ? 1 : 0) - page_has_private(page);
|
||||||
rc = migrate_page_move_mapping(mapping, newpage,
|
rc = migrate_page_move_mapping(mapping, newpage,
|
||||||
page, NULL, mode, extra_count);
|
page, mode, extra_count);
|
||||||
if (rc != MIGRATEPAGE_SUCCESS) {
|
if (rc != MIGRATEPAGE_SUCCESS) {
|
||||||
if (atomic_written)
|
if (atomic_written)
|
||||||
mutex_unlock(&fi->inmem_lock);
|
mutex_unlock(&fi->inmem_lock);
|
||||||
|
|
|
@ -563,7 +563,7 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage,
|
||||||
{
|
{
|
||||||
int ret;
|
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)
|
if (ret != MIGRATEPAGE_SUCCESS)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
|
@ -1481,7 +1481,7 @@ static int ubifs_migrate_page(struct address_space *mapping,
|
||||||
{
|
{
|
||||||
int rc;
|
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)
|
if (rc != MIGRATEPAGE_SUCCESS)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
|
|
|
@ -77,8 +77,7 @@ extern void migrate_page_copy(struct page *newpage, struct page *page);
|
||||||
extern int migrate_huge_page_move_mapping(struct address_space *mapping,
|
extern int migrate_huge_page_move_mapping(struct address_space *mapping,
|
||||||
struct page *newpage, struct page *page);
|
struct page *newpage, struct page *page);
|
||||||
extern int migrate_page_move_mapping(struct address_space *mapping,
|
extern int migrate_page_move_mapping(struct address_space *mapping,
|
||||||
struct page *newpage, struct page *page,
|
struct page *newpage, struct page *page, enum migrate_mode mode,
|
||||||
struct buffer_head *head, enum migrate_mode mode,
|
|
||||||
int extra_count);
|
int extra_count);
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
|
@ -399,8 +399,7 @@ static int expected_page_refs(struct page *page)
|
||||||
* 3 for pages with a mapping and PagePrivate/PagePrivate2 set.
|
* 3 for pages with a mapping and PagePrivate/PagePrivate2 set.
|
||||||
*/
|
*/
|
||||||
int migrate_page_move_mapping(struct address_space *mapping,
|
int migrate_page_move_mapping(struct address_space *mapping,
|
||||||
struct page *newpage, struct page *page,
|
struct page *newpage, struct page *page, enum migrate_mode mode,
|
||||||
struct buffer_head *head, enum migrate_mode mode,
|
|
||||||
int extra_count)
|
int extra_count)
|
||||||
{
|
{
|
||||||
XA_STATE(xas, &mapping->i_pages, page_index(page));
|
XA_STATE(xas, &mapping->i_pages, page_index(page));
|
||||||
|
@ -687,7 +686,7 @@ int migrate_page(struct address_space *mapping,
|
||||||
|
|
||||||
BUG_ON(PageWriteback(page)); /* Writeback must be complete */
|
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)
|
if (rc != MIGRATEPAGE_SUCCESS)
|
||||||
return rc;
|
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)
|
if (rc != MIGRATEPAGE_SUCCESS)
|
||||||
goto unlock_buffers;
|
goto unlock_buffers;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue