summaryrefslogtreecommitdiffstats
path: root/mm/mmap.c
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2022-06-18 16:20:27 +0800
committerakpm <akpm@linux-foundation.org>2022-07-29 18:07:13 -0700
commit7f82f922319ede486540e8746769865b9508d2c2 (patch)
tree20768512579a77989c2b1ff0c871544925cf85e4 /mm/mmap.c
parentb0cab80ecd54ae3b2356bb081af0bffd538c8265 (diff)
downloadlinux-7f82f922319ede486540e8746769865b9508d2c2.tar.gz
linux-7f82f922319ede486540e8746769865b9508d2c2.tar.bz2
linux-7f82f922319ede486540e8746769865b9508d2c2.zip
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>
Diffstat (limited to 'mm/mmap.c')
-rw-r--r--mm/mmap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index d529837bc8c3..ec4e0d53a388 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1847,7 +1847,6 @@ unmap_and_free_vma:
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
- charged = 0;
if (vm_flags & VM_SHARED)
mapping_unmap_writable(file->f_mapping);
free_vma: