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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/mm/madvise.c b/mm/madvise.c
index 51bffa414027..6975bc812542 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -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)
 {
-        int ret = 0;
-
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
         for (; start < end; start += PAGE_SIZE) {
                 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)
                         return ret;
+
                 if (PageHWPoison(p)) {
                         put_page(p);
                         continue;
@@ -369,7 +370,7 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end)
                 /* Ignore return value for now */
                 memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED);
         }
-        return ret;
+        return 0;
 }
 #endif