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

Commit 138ce286 authored by Wu Fengguang's avatar Wu Fengguang Committed by Andi Kleen
Browse files

HWPOISON: return 0 to indicate success reliably 



Return 0 to indicate success, when
- action result is RECOVERED or DELAYED
- no extra page reference

Note that dirty swapcache pages are kept in swapcache, so can have one
more reference count.

Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent d95ea51e

mm/memory-failure.c

+6 −2
Original line number Diff line number Diff line
@@ -654,17 +654,21 @@ static int page_action(struct page_state *ps, struct page *p, 
	action_result(pfn, ps->msg, result);



	count = page_count(p) - 1;

	if (count != 0)

	if (ps->action == me_swapcache_dirty && result == DELAYED)

		count--;

	if (count != 0) {

		printk(KERN_ERR

		       "MCE %#lx: %s page still referenced by %d users\n",

		       pfn, ps->msg, count);

		result = FAILED;

	}



	/* Could do more checks here if page looks ok */

	/*

	 * Could adjust zone counters here to correct for the missing page.

	 */



	return result == RECOVERED ? 0 : -EBUSY;

	return (result == RECOVERED || result == DELAYED) ? 0 : -EBUSY;

}



#define N_UNMAP_TRIES 5