From: Hugh Dickins The original vm_stat_account has fallen into disuse, with only one user, and only one user of vm_stat_unaccount. It's easier to keep track if we convert them all to __vm_stat_account, then free it from its __shackles. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton --- arch/ia64/kernel/perfmon.c | 3 ++- arch/ia64/mm/fault.c | 2 +- include/linux/mm.h | 16 ++-------------- kernel/fork.c | 2 +- mm/mmap.c | 20 ++++++++++---------- mm/mprotect.c | 4 ++-- mm/mremap.c | 4 ++-- 7 files changed, 20 insertions(+), 31 deletions(-) diff -puN arch/ia64/kernel/perfmon.c~mm-vm_stat_account-unshackled arch/ia64/kernel/perfmon.c --- devel/arch/ia64/kernel/perfmon.c~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/perfmon.c 2005-10-11 00:34:33.000000000 -0700 @@ -2352,7 +2352,8 @@ pfm_smpl_buffer_alloc(struct task_struct insert_vm_struct(mm, vma); mm->total_vm += size >> PAGE_SHIFT; - vm_stat_account(vma); + vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, + vma_pages(vma)); up_write(&task->mm->mmap_sem); /* diff -puN arch/ia64/mm/fault.c~mm-vm_stat_account-unshackled arch/ia64/mm/fault.c --- devel/arch/ia64/mm/fault.c~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/arch/ia64/mm/fault.c 2005-10-11 00:34:33.000000000 -0700 @@ -41,7 +41,7 @@ expand_backing_store (struct vm_area_str vma->vm_mm->total_vm += grow; if (vma->vm_flags & VM_LOCKED) vma->vm_mm->locked_vm += grow; - __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow); + vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow); return 0; } diff -puN include/linux/mm.h~mm-vm_stat_account-unshackled include/linux/mm.h --- devel/include/linux/mm.h~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/include/linux/mm.h 2005-10-11 00:34:33.000000000 -0700 @@ -922,26 +922,14 @@ int remap_pfn_range(struct vm_area_struc unsigned long, unsigned long, pgprot_t); #ifdef CONFIG_PROC_FS -void __vm_stat_account(struct mm_struct *, unsigned long, struct file *, long); +void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long); #else -static inline void __vm_stat_account(struct mm_struct *mm, +static inline void vm_stat_account(struct mm_struct *mm, unsigned long flags, struct file *file, long pages) { } #endif /* CONFIG_PROC_FS */ -static inline void vm_stat_account(struct vm_area_struct *vma) -{ - __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, - vma_pages(vma)); -} - -static inline void vm_stat_unaccount(struct vm_area_struct *vma) -{ - __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, - -vma_pages(vma)); -} - /* update per process rss and vm hiwater data */ extern void update_mem_hiwater(struct task_struct *tsk); diff -puN kernel/fork.c~mm-vm_stat_account-unshackled kernel/fork.c --- devel/kernel/fork.c~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/kernel/fork.c 2005-10-11 00:34:33.000000000 -0700 @@ -212,7 +212,7 @@ static inline int dup_mmap(struct mm_str if (mpnt->vm_flags & VM_DONTCOPY) { long pages = vma_pages(mpnt); mm->total_vm -= pages; - __vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file, + vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file, -pages); continue; } diff -puN mm/mmap.c~mm-vm_stat_account-unshackled mm/mmap.c --- devel/mm/mmap.c~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/mm/mmap.c 2005-10-11 00:34:33.000000000 -0700 @@ -832,7 +832,7 @@ none: } #ifdef CONFIG_PROC_FS -void __vm_stat_account(struct mm_struct *mm, unsigned long flags, +void vm_stat_account(struct mm_struct *mm, unsigned long flags, struct file *file, long pages) { const unsigned long stack_flags @@ -1110,7 +1110,7 @@ munmap_back: } out: mm->total_vm += len >> PAGE_SHIFT; - __vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); + vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); if (vm_flags & VM_LOCKED) { mm->locked_vm += len >> PAGE_SHIFT; make_pages_present(addr, addr + len); @@ -1475,7 +1475,7 @@ static int acct_stack_growth(struct vm_a mm->total_vm += grow; if (vma->vm_flags & VM_LOCKED) mm->locked_vm += grow; - __vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow); + vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow); return 0; } @@ -1610,15 +1610,15 @@ find_extend_vma(struct mm_struct * mm, u * By the time this function is called, the area struct has been * removed from the process mapping list. */ -static void unmap_vma(struct mm_struct *mm, struct vm_area_struct *area) +static void unmap_vma(struct mm_struct *mm, struct vm_area_struct *vma) { - size_t len = area->vm_end - area->vm_start; + long nrpages = vma_pages(vma); - area->vm_mm->total_vm -= len >> PAGE_SHIFT; - if (area->vm_flags & VM_LOCKED) - area->vm_mm->locked_vm -= len >> PAGE_SHIFT; - vm_stat_unaccount(area); - remove_vm_struct(area); + mm->total_vm -= nrpages; + if (vma->vm_flags & VM_LOCKED) + mm->locked_vm -= nrpages; + vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); + remove_vm_struct(vma); } /* diff -puN mm/mprotect.c~mm-vm_stat_account-unshackled mm/mprotect.c --- devel/mm/mprotect.c~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/mm/mprotect.c 2005-10-11 00:34:33.000000000 -0700 @@ -168,8 +168,8 @@ success: vma->vm_flags = newflags; vma->vm_page_prot = newprot; change_protection(vma, start, end, newprot); - __vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); - __vm_stat_account(mm, newflags, vma->vm_file, nrpages); + vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); + vm_stat_account(mm, newflags, vma->vm_file, nrpages); return 0; fail: diff -puN mm/mremap.c~mm-vm_stat_account-unshackled mm/mremap.c --- devel/mm/mremap.c~mm-vm_stat_account-unshackled 2005-10-11 00:34:33.000000000 -0700 +++ devel-akpm/mm/mremap.c 2005-10-11 00:34:33.000000000 -0700 @@ -233,7 +233,7 @@ static unsigned long move_vma(struct vm_ * since do_munmap() will decrement it by old_len == new_len */ mm->total_vm += new_len >> PAGE_SHIFT; - __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT); + vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT); if (do_munmap(mm, old_addr, old_len) < 0) { /* OOM: unable to split vma, just get accounts right */ @@ -384,7 +384,7 @@ unsigned long do_mremap(unsigned long ad addr + new_len, vma->vm_pgoff, NULL); current->mm->total_vm += pages; - __vm_stat_account(vma->vm_mm, vma->vm_flags, + vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, pages); if (vma->vm_flags & VM_LOCKED) { current->mm->locked_vm += pages; _