Commit 7c61f917 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds

mm/mmap: rename __vma_unlink_common() to __vma_unlink()

__vma_unlink_common() and __vma_unlink() are counterparts.  Since there is
no function named __vma_unlink(), let's rename __vma_unlink_common() to
__vma_unlink() to make the code more self-explanatory and easy for
audience to understand.

Otherwise we may expect there are several variants of vma_unlink() and
__vma_unlink_common() is used by them.
Signed-off-by: default avatarWei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: https://lkml.kernel.org/r/20200809232057.23477-1-richard.weiyang@linux.alibaba.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a7069ee3
...@@ -677,7 +677,7 @@ static void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) ...@@ -677,7 +677,7 @@ static void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
mm->map_count++; mm->map_count++;
} }
static __always_inline void __vma_unlink_common(struct mm_struct *mm, static __always_inline void __vma_unlink(struct mm_struct *mm,
struct vm_area_struct *vma, struct vm_area_struct *vma,
struct vm_area_struct *ignore) struct vm_area_struct *ignore)
{ {
...@@ -859,7 +859,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, ...@@ -859,7 +859,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
* us to remove next before dropping the locks. * us to remove next before dropping the locks.
*/ */
if (remove_next != 3) if (remove_next != 3)
__vma_unlink_common(mm, next, next); __vma_unlink(mm, next, next);
else else
/* /*
* vma is not before next if they've been * vma is not before next if they've been
...@@ -870,7 +870,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, ...@@ -870,7 +870,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
* "next" (which is stored in post-swap() * "next" (which is stored in post-swap()
* "vma"). * "vma").
*/ */
__vma_unlink_common(mm, next, vma); __vma_unlink(mm, next, vma);
if (file) if (file)
__remove_shared_vm_struct(next, file, mapping); __remove_shared_vm_struct(next, file, mapping);
} else if (insert) { } else if (insert) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment