| Message ID | 20210210072409.60587-1-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm/huge_memory.c: Remove unnecessary local variable ret2 | expand |
Hi: On 2021/2/10 15:24, Miaohe Lin wrote: > There is no need to use a new local variable ret2 to get the return value > of handle_userfault(). Use ret directly to make code more succinct. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> friendly ping in case it's forgotten. :) > --- > mm/huge_memory.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 395c75111d33..caf552834dbb 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -624,14 +624,12 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, > > /* Deliver the page fault to userland */ > if (userfaultfd_missing(vma)) { > - vm_fault_t ret2; > - > spin_unlock(vmf->ptl); > put_page(page); > pte_free(vma->vm_mm, pgtable); > - ret2 = handle_userfault(vmf, VM_UFFD_MISSING); > - VM_BUG_ON(ret2 & VM_FAULT_FALLBACK); > - return ret2; > + ret = handle_userfault(vmf, VM_UFFD_MISSING); > + VM_BUG_ON(ret & VM_FAULT_FALLBACK); > + return ret; > } > > entry = mk_huge_pmd(page, vma->vm_page_prot); >
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 395c75111d33..caf552834dbb 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -624,14 +624,12 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, /* Deliver the page fault to userland */ if (userfaultfd_missing(vma)) { - vm_fault_t ret2; - spin_unlock(vmf->ptl); put_page(page); pte_free(vma->vm_mm, pgtable); - ret2 = handle_userfault(vmf, VM_UFFD_MISSING); - VM_BUG_ON(ret2 & VM_FAULT_FALLBACK); - return ret2; + ret = handle_userfault(vmf, VM_UFFD_MISSING); + VM_BUG_ON(ret & VM_FAULT_FALLBACK); + return ret; } entry = mk_huge_pmd(page, vma->vm_page_prot);
There is no need to use a new local variable ret2 to get the return value of handle_userfault(). Use ret directly to make code more succinct. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- mm/huge_memory.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)