Commit 9d81fbe0 authored Nov 30, 2019 by Wei Yang Committed by Linus Torvalds Dec 01, 2019

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.com


Signed-off-by: Wei 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 93b343ab

mm/mmap.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -702,13 +702,6 @@ static __always_inline void __vma_unlink_common(struct mm_struct *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
		* is already present in an i_mmap tree without adjusting the tree.
		@@ -881,7 +874,7 @@ again:
		* us to remove next before dropping the locks.
		*/
		if (remove_next != 3)
		__vma_unlink_prev(mm, next, vma);
		__vma_unlink_common(mm, next, next);
		else
		/*
		* vma is not before next if they've been

Admin message