diff options
author | Andrea Arcangeli <aarcange@redhat.com> | 2015-11-05 18:49:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 19:34:48 -0800 |
commit | 85c6e8dd23c6aa9ff299bf5256fe5f0a6c44f100 (patch) | |
tree | 40353db4104bd1b5b1339a8e3dfc647509d9903c /mm | |
parent | 98666f8a2576b12f5f3ebcef61a8cdbefede1be3 (diff) | |
download | linux-stable-85c6e8dd23c6aa9ff299bf5256fe5f0a6c44f100.tar.gz linux-stable-85c6e8dd23c6aa9ff299bf5256fe5f0a6c44f100.tar.bz2 linux-stable-85c6e8dd23c6aa9ff299bf5256fe5f0a6c44f100.zip |
ksm: use find_mergeable_vma in try_to_merge_with_ksm_page
Doing the VM_MERGEABLE check after the page == kpage check won't provide
any meaningful benefit. The !vma->anon_vma check of find_mergeable_vma is
the only superfluous bit in using find_mergeable_vma because the !PageAnon
check of try_to_merge_one_page() implicitly checks for that, but it still
looks cleaner to share the same find_mergeable_vma().
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Petr Holasek <pholasek@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/ksm.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1021,8 +1021,6 @@ static int try_to_merge_one_page(struct vm_area_struct *vma, if (page == kpage) /* ksm page forked */ return 0; - if (!(vma->vm_flags & VM_MERGEABLE)) - goto out; if (PageTransCompound(page) && page_trans_compound_anon_split(page)) goto out; BUG_ON(PageTransCompound(page)); @@ -1087,10 +1085,8 @@ static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item, int err = -EFAULT; down_read(&mm->mmap_sem); - if (ksm_test_exit(mm)) - goto out; - vma = find_vma(mm, rmap_item->address); - if (!vma || vma->vm_start > rmap_item->address) + vma = find_mergeable_vma(mm, rmap_item->address); + if (!vma) goto out; err = try_to_merge_one_page(vma, page, kpage); |