diff options
Diffstat (limited to 'mm/hwpoison-inject.c')
| -rw-r--r-- | mm/hwpoison-inject.c | 13 | 
1 files changed, 8 insertions, 5 deletions
| diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c index 329caf56df22..4ca5fe0042e1 100644 --- a/mm/hwpoison-inject.c +++ b/mm/hwpoison-inject.c @@ -34,13 +34,13 @@ static int hwpoison_inject(void *data, u64 val)  	if (!hwpoison_filter_enable)  		goto inject; -	if (!PageLRU(p) && !PageHuge(p)) -		shake_page(p, 0); +	if (!PageLRU(hpage) && !PageHuge(p)) +		shake_page(hpage, 0);  	/*  	 * This implies unable to support non-LRU pages.  	 */ -	if (!PageLRU(p) && !PageHuge(p)) -		return 0; +	if (!PageLRU(hpage) && !PageHuge(p)) +		goto put_out;  	/*  	 * do a racy check with elevated page count, to make sure PG_hwpoison @@ -52,11 +52,14 @@ static int hwpoison_inject(void *data, u64 val)  	err = hwpoison_filter(hpage);  	unlock_page(hpage);  	if (err) -		return 0; +		goto put_out;  inject:  	pr_info("Injecting memory failure at pfn %#lx\n", pfn);  	return memory_failure(pfn, 18, MF_COUNT_INCREASED); +put_out: +	put_page(hpage); +	return 0;  }  static int hwpoison_unpoison(void *data, u64 val) | 
