lkml.org 
[lkml]   [2015]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mm/mmap.c: Do not initialize retval in mmap_pgoff()
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 <gang.chen.5i5j@gmail.com>

Acked-by: Oleg Nesterov <oleg@redhat.com>

> --- 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
>
>



\
 
 \ /
  Last update: 2015-10-05 19:01    [W:0.035 / U:0.736 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site