Commit 9d81fbe0 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds

mm/mmap.c: __vma_unlink_prev() is not necessary now

The third parameter of __vma_unlink_common() could differentiate these two
types.  __vma_unlink_prev() is not necessary now.

Link: http://lkml.kernel.org/r/20191006012636.31521-2-richardw.yang@linux.intel.comSigned-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>

Cc: Christoph Hellwig <hch@infradead.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93b343ab
...@@ -702,13 +702,6 @@ static __always_inline void __vma_unlink_common(struct mm_struct *mm, ...@@ -702,13 +702,6 @@ static __always_inline void __vma_unlink_common(struct mm_struct *mm,
vmacache_invalidate(mm); vmacache_invalidate(mm);
} }
static inline void __vma_unlink_prev(struct mm_struct *mm,
struct vm_area_struct *vma,
struct vm_area_struct *prev)
{
__vma_unlink_common(mm, vma, vma);
}
/* /*
* We cannot adjust vm_start, vm_end, vm_pgoff fields of a vma that * We cannot adjust vm_start, vm_end, vm_pgoff fields of a vma that
* is already present in an i_mmap tree without adjusting the tree. * is already present in an i_mmap tree without adjusting the tree.
...@@ -881,7 +874,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, ...@@ -881,7 +874,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_prev(mm, next, vma); __vma_unlink_common(mm, next, next);
else else
/* /*
* vma is not before next if they've been * vma is not before next if they've been
......
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