Commit ed8c2f49 authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds
Browse files

mm/hwpoison: change argument struct page **hpagep to *hpage 

It's unnecessary to pass in a struct page **hpagep because it's never
modified.  Changing to use *hpage to simplify the code.

Link: https://lkml.kernel.org/r/20210814105131.48814-4-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea3732f7

mm/memory-failure.c

+3 −4
Original line number Diff line number Diff line
@@ -1271,14 +1271,13 @@ static int get_hwpoison_page(struct page *p, unsigned long flags) 
 * the pages and send SIGBUS to the processes if the data was dirty.

 */

static bool hwpoison_user_mappings(struct page *p, unsigned long pfn,

				  int flags, struct page **hpagep)

				  int flags, struct page *hpage)

{

	enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_SYNC;

	struct address_space *mapping;

	LIST_HEAD(tokill);

	bool unmap_success;

	int kill = 1, forcekill;

	struct page *hpage = *hpagep;

	bool mlocked = PageMlocked(hpage);



	/*
@@ -1503,7 +1502,7 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags) 
		goto out;

	}



	if (!hwpoison_user_mappings(p, pfn, flags, &head)) {

	if (!hwpoison_user_mappings(p, pfn, flags, head)) {

		action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

		res = -EBUSY;

		goto out;
@@ -1783,7 +1782,7 @@ int memory_failure(unsigned long pfn, int flags) 
	 * Now take care of user space mappings.

	 * Abort on fail: __delete_from_page_cache() assumes unmapped page.

	 */

	if (!hwpoison_user_mappings(p, pfn, flags, &p)) {

	if (!hwpoison_user_mappings(p, pfn, flags, p)) {

		action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

		res = -EBUSY;

		goto unlock_page;