From 29d4cb467e5ed5f42abb874272d5de95726c5572 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Thu, 19 Nov 2020 22:54:50 -0500 Subject: [PATCH] mm/mmap.c: whitespace and brace fixes Signed-off-by: Liam R. Howlett --- mm/mmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 07dc215e2c04..b20a9a18a772 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2715,9 +2715,8 @@ void vma_shorten(struct vm_area_struct *vma, unsigned long start, flush_dcache_mmap_unlock(mapping); } - if (!next) { + if (!next) mm->highest_vm_end = vm_end_gap(vma); - } if (anon_vma) { anon_vma_interval_tree_post_update_vma(vma); @@ -2762,6 +2761,7 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, if (unlikely(uf)) { int error = userfaultfd_unmap_prep(vma, start, end, uf); + if (error) return error; } @@ -2864,6 +2864,7 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, if (last == &end_split) { if (last->vm_flags & VM_ACCOUNT) { long nrpages = vma_pages(last); + vm_stat_account(mm, last->vm_flags, -nrpages); vm_unacct_memory(nrpages); } -- 2.50.1