Commit 325c4ef5 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

mm/madvise.c:madvise_hwpoison(): remove local `ret'

madvise_hwpoison() has two locals called "ret".  Fix it all up.

Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8302423b
...@@ -343,15 +343,16 @@ static long madvise_remove(struct vm_area_struct *vma, ...@@ -343,15 +343,16 @@ static long madvise_remove(struct vm_area_struct *vma,
*/ */
static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end) static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end)
{ {
int ret = 0;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
for (; start < end; start += PAGE_SIZE) { for (; start < end; start += PAGE_SIZE) {
struct page *p; struct page *p;
int ret = get_user_pages_fast(start, 1, 0, &p); int ret;
ret = get_user_pages_fast(start, 1, 0, &p);
if (ret != 1) if (ret != 1)
return ret; return ret;
if (PageHWPoison(p)) { if (PageHWPoison(p)) {
put_page(p); put_page(p);
continue; continue;
...@@ -369,7 +370,7 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end) ...@@ -369,7 +370,7 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end)
/* Ignore return value for now */ /* Ignore return value for now */
memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED); memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED);
} }
return ret; return 0;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment