On 10/06, Chen Gang wrote: > > When fget() fails, can return -EBADF directly.
To me this change actually makes the code more readable and clean. > Signed-off-by: Chen Gang <[email protected]> Acked-by: Oleg Nesterov <[email protected]> > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1412,13 +1412,13 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, > unsigned long, len, > unsigned long, fd, unsigned long, pgoff) > { > struct file *file = NULL; > - unsigned long retval = -EBADF; > + unsigned long retval; > > if (!(flags & MAP_ANONYMOUS)) { > audit_mmap_fd(fd, flags); > file = fget(fd); > if (!file) > - goto out; > + return -EBADF; > if (is_file_hugepages(file)) > len = ALIGN(len, huge_page_size(hstate_file(file))); > retval = -EINVAL; > @@ -1453,7 +1453,6 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, > unsigned long, len, > out_fput: > if (file) > fput(file); > -out: > return retval; > } > > -- > 1.9.3 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
