[1/1] mm: mmap: Remove unnecessary local variable
diff mbox series

Message ID 20201222103249.30683-1-adrianhuang0701@gmail.com
State Accepted
Commit b7204006c8602f43793ee1b285e963084bdb1a26
Headers show
Series
  • [1/1] mm: mmap: Remove unnecessary local variable
Related show

Commit Message

Adrian Huang Dec. 22, 2020, 10:32 a.m. UTC
From: Adrian Huang <ahuang12@lenovo.com>

The local variable 'retval' is assigned just for once in __do_sys_brk(),
and the function returns the value of the local variable right after
the assignment. Remove unnecessary assignment and local variable
declaration.

Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
---
 mm/mmap.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Souptick Joarder Dec. 22, 2020, 3:17 p.m. UTC | #1
On Tue, Dec 22, 2020 at 4:03 PM Adrian Huang <adrianhuang0701@gmail.com> wrote:
>
> From: Adrian Huang <ahuang12@lenovo.com>
>
> The local variable 'retval' is assigned just for once in __do_sys_brk(),
> and the function returns the value of the local variable right after
> the assignment. Remove unnecessary assignment and local variable
> declaration.
>
> Signed-off-by: Adrian Huang <ahuang12@lenovo.com>

Acked-by: Souptick Joarder <jrdr.linux@gmail.com>

> ---
>  mm/mmap.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/mm/mmap.c b/mm/mmap.c
> index dc7206032387..482c0c0bbe06 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -189,7 +189,6 @@ static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long
>                 struct list_head *uf);
>  SYSCALL_DEFINE1(brk, unsigned long, brk)
>  {
> -       unsigned long retval;
>         unsigned long newbrk, oldbrk, origbrk;
>         struct mm_struct *mm = current->mm;
>         struct vm_area_struct *next;
> @@ -281,9 +280,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
>         return brk;
>
>  out:
> -       retval = origbrk;
>         mmap_write_unlock(mm);
> -       return retval;
> +       return origbrk;
>  }
>
>  static inline unsigned long vma_compute_gap(struct vm_area_struct *vma)
> --
> 2.17.1
>
>
David Hildenbrand Dec. 29, 2020, 9:17 a.m. UTC | #2
On 22.12.20 11:32, Adrian Huang wrote:
> From: Adrian Huang <ahuang12@lenovo.com>
> 
> The local variable 'retval' is assigned just for once in __do_sys_brk(),
> and the function returns the value of the local variable right after
> the assignment. Remove unnecessary assignment and local variable
> declaration.
> 
> Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
> ---
>  mm/mmap.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/mm/mmap.c b/mm/mmap.c
> index dc7206032387..482c0c0bbe06 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -189,7 +189,6 @@ static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long
>  		struct list_head *uf);
>  SYSCALL_DEFINE1(brk, unsigned long, brk)
>  {
> -	unsigned long retval;
>  	unsigned long newbrk, oldbrk, origbrk;
>  	struct mm_struct *mm = current->mm;
>  	struct vm_area_struct *next;
> @@ -281,9 +280,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
>  	return brk;
>  
>  out:
> -	retval = origbrk;
>  	mmap_write_unlock(mm);
> -	return retval;
> +	return origbrk;
>  }

Reviewed-by: David Hildenbrand <david@redhat.com>

Patch
diff mbox series

diff --git a/mm/mmap.c b/mm/mmap.c
index dc7206032387..482c0c0bbe06 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -189,7 +189,6 @@  static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long
 		struct list_head *uf);
 SYSCALL_DEFINE1(brk, unsigned long, brk)
 {
-	unsigned long retval;
 	unsigned long newbrk, oldbrk, origbrk;
 	struct mm_struct *mm = current->mm;
 	struct vm_area_struct *next;
@@ -281,9 +280,8 @@  SYSCALL_DEFINE1(brk, unsigned long, brk)
 	return brk;
 
 out:
-	retval = origbrk;
 	mmap_write_unlock(mm);
-	return retval;
+	return origbrk;
 }
 
 static inline unsigned long vma_compute_gap(struct vm_area_struct *vma)