summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2016-10-08 02:01:31 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-08 03:46:29 +0200
commit97a42cd4398162aba77da55b568d85e5ec6b7705 (patch)
tree238dd26c444f84c69169c38a26e2ecff8f95a8b7
parentmm: vma_merge: fix vm_page_prot SMP race condition against rmap_walk (diff)
downloadlinux-97a42cd4398162aba77da55b568d85e5ec6b7705.tar.xz
linux-97a42cd4398162aba77da55b568d85e5ec6b7705.zip
mm: vma_adjust: remove superfluous check for next not NULL
If next would be NULL we couldn't reach such code path. Link: http://lkml.kernel.org/r/1474309513-20313-2-git-send-email-aarcange@redhat.com Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Cc: Rik van Riel <riel@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Jan Vorlicek <janvorli@microsoft.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/mmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index e53637f8ac42..aa29d43130b3 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -706,7 +706,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
* If next doesn't have anon_vma, import from vma after
* next, if the vma overlaps with it.
*/
- if (remove_next == 2 && next && !next->anon_vma)
+ if (remove_next == 2 && !next->anon_vma)
exporter = next->vm_next;
} else if (end > next->vm_start) {