mm: remove more IS_ERR_VALUE abuses

The do_brk() and vm_brk() return value was "unsigned long" and returned
the starting address on success, and an error value on failure.  The
reasons are entirely historical, and go back to it basically behaving
like the mmap() interface does.

However, nobody actually wanted that interface, and it causes totally
pointless IS_ERR_VALUE() confusion.

What every single caller actually wants is just the simpler integer
return of zero for success and negative error number on failure.

So just convert to that much clearer and more common calling convention,
and get rid of all the IS_ERR_VALUE() uses wrt vm_brk().

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 12 insertions, 17 deletions

diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
index 2fab9f130e51..64b331ae3428 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -127,11 +127,8 @@ static int set_brk(unsigned long start, unsigned long end)
 {
         start = PAGE_ALIGN(start);
         end = PAGE_ALIGN(end);
-        if (end > start) {
-                unsigned long addr;
-                addr = vm_brk(start, end - start);
-                if (BAD_ADDR(addr))
-                        return addr;
+        if (end > start)
+                return vm_brk(start, end - start);
         }
         return 0;
 }
@@ -275,7 +272,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
                 map_size = ex.a_text+ex.a_data;
 #endif
                 error = vm_brk(text_addr & PAGE_MASK, map_size);
-                if (error != (text_addr & PAGE_MASK))
+                if (error)
                         return error;
 
                 error = read_code(bprm->file, text_addr, pos,
@@ -298,7 +295,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
 
                 if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
                         error = vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-                        if (IS_ERR_VALUE(error))
+                        if (error)
                                 return error;
 
                         read_code(bprm->file, N_TXTADDR(ex), fd_offset,
@@ -382,7 +379,7 @@ static int load_aout_library(struct file *file)
                                file);
                 }
                 retval = vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-                if (IS_ERR_VALUE(retval))
+                if (retval)
                         goto out;
 
                 read_code(file, start_addr, N_TXTOFF(ex),
@@ -402,9 +399,8 @@ static int load_aout_library(struct file *file)
         len = PAGE_ALIGN(ex.a_text + ex.a_data);
         bss = ex.a_text + ex.a_data + ex.a_bss;
         if (bss > len) {
-                error = vm_brk(start_addr + len, bss - len);
-                retval = error;
-                if (error != start_addr + len)
+                retval = vm_brk(start_addr + len, bss - len);
+                if (retval)
                         goto out;
         }
         retval = 0;
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 938fc4ede764..e158b22ef32f 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -96,10 +96,9 @@ static int set_brk(unsigned long start, unsigned long end)
         start = ELF_PAGEALIGN(start);
         end = ELF_PAGEALIGN(end);
         if (end > start) {
-                unsigned long addr;
-                addr = vm_brk(start, end - start);
-                if (BAD_ADDR(addr))
-                        return addr;
+                int error = vm_brk(start, end - start);
+                if (error)
+                        return error;
         }
         current->mm->start_brk = current->mm->brk = end;
         return 0;
@@ -629,7 +628,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
 
                 /* Map the last of the bss segment */
                 error = vm_brk(elf_bss, last_bss - elf_bss);
-                if (BAD_ADDR(error))
+                if (error)
                         goto out;
         }
 
@@ -1178,7 +1177,7 @@ static int load_elf_library(struct file *file)
         bss = eppnt->p_memsz + eppnt->p_vaddr;
         if (bss > len) {
                 error = vm_brk(len, bss - len);
-                if (BAD_ADDR(error))
+                if (error)
                         goto out_free_ph;
         }
         error = 0;