summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2022-06-18 16:20:27 +0800
committerLiam R. Howlett <Liam.Howlett@oracle.com>2022-07-19 20:15:11 -0400
commit8cad0f9701d5fb76a659be8dd4d07707413dd02a (patch)
tree0b386153d1b6a90cf0a5e363297dee1e1f8d869e
parent5c55f42c71fb3924952bf17d77ad7952c607a353 (diff)
mm/mmap.c: fix missing call to vm_unacct_memory in mmap_region
Since the beginning, charged is set to 0 to avoid calling vm_unacct_memory twice because vm_unacct_memory will be called by above unmap_region. But since commit 4f74d2c8e827 ("vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces"), unmap_region doesn't call vm_unacct_memory anymore. So charged shouldn't be set to 0 now otherwise the calling to paired vm_unacct_memory will be missed and leads to imbalanced account. Link: https://lkml.kernel.org/r/20220618082027.43391-1-linmiaohe@huawei.com Fixes: 4f74d2c8e827 ("vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces") Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/mmap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index ec12e83fad1c..522fdbfbf5af 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2790,7 +2790,6 @@ unmap_and_free_vma:
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, mas.tree, vma, prev, next, vma->vm_start, vma->vm_end);
- charged = 0;
if (vm_flags & VM_SHARED)
mapping_unmap_writable(file->f_mapping);
free_vma: