Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab41ee68 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

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: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88dbcbb3

fs/aio.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int aio_migratepage(struct address_space *mapping, struct page *new, 
	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;

fs/f2fs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -2738,7 +2738,7 @@ int f2fs_migrate_page(struct address_space *mapping, 
	 */

	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);

fs/iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage, 
{

	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;

fs/ubifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ static int ubifs_migrate_page(struct address_space *mapping, 
{

	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;

include/linux/migrate.h

+1 −2
Original line number Diff line number Diff line
@@ -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,

				  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