Unverified Commit 5cc09f76 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15794 Revert "arm64: mm: add mc support for __buffer_migrate_page" 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/IEXX42P5VOVNXZSMVAI6MTNDF3XW3SVG/ 
 
https://gitee.com/openeuler/kernel/issues/IB0OV7 
 
Link:https://gitee.com/openeuler/kernel/pulls/15794

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents dc9ab87d 7aba3d62

mm/migrate.c

+1 −11
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ static int __buffer_migrate_page(struct address_space *mapping, 
	struct buffer_head *bh, *head;

	int rc;

	int expected_count;

	bool copy_done = false;



	if (!page_has_buffers(page))

		return migrate_page(mapping, newpage, page, mode);
@@ -861,13 +860,7 @@ static int __buffer_migrate_page(struct address_space *mapping, 
		}

	}



	if (IS_ENABLED(CONFIG_ARM64) && IS_ENABLED(CONFIG_ARCH_HAS_COPY_MC) &&

	    (mode != MIGRATE_SYNC_NO_COPY)) {

		rc = migrate_page_mc_extra(mapping, newpage, page, mode, 0);

		copy_done = true;

	} else {

	rc = migrate_page_move_mapping(mapping, newpage, page, 0);

	}

	if (rc != MIGRATEPAGE_SUCCESS)

		goto unlock_buffers;
@@ -880,9 +873,6 @@ static int __buffer_migrate_page(struct address_space *mapping, 


	} while (bh != head);



	if (copy_done)

		goto unlock_buffers;



	if (mode != MIGRATE_SYNC_NO_COPY)

		migrate_page_copy(newpage, page);

	else