From 3504684e1d12d08b7da10ad55c9a6c9bf01ba38b Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Wed, 21 Mar 2012 16:34:11 -0700 Subject: [PATCH] --- yaml --- r: 292659 b: refs/heads/master c: ef6942224a185c9e434f6cfe69fe434e732f5b38 h: refs/heads/master i: 292657: b45efa4acf33a26d3d89a0097a4fbe84ccd17e26 292655: b00db001f8356f128bf49ffa188efdab9c7043d7 v: v3 --- [refs] | 2 +- trunk/mm/ksm.c | 34 +++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index f0d8228edee6..a8d290d16372 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc9a6c8776615f9c194ccf0b63a0aa5628235545 +refs/heads/master: ef6942224a185c9e434f6cfe69fe434e732f5b38 diff --git a/trunk/mm/ksm.c b/trunk/mm/ksm.c index a6d3fb7e6c10..47c885368890 100644 --- a/trunk/mm/ksm.c +++ b/trunk/mm/ksm.c @@ -374,6 +374,20 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr) return (ret & VM_FAULT_OOM) ? -ENOMEM : 0; } +static struct vm_area_struct *find_mergeable_vma(struct mm_struct *mm, + unsigned long addr) +{ + struct vm_area_struct *vma; + if (ksm_test_exit(mm)) + return NULL; + vma = find_vma(mm, addr); + if (!vma || vma->vm_start > addr) + return NULL; + if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma) + return NULL; + return vma; +} + static void break_cow(struct rmap_item *rmap_item) { struct mm_struct *mm = rmap_item->mm; @@ -387,15 +401,9 @@ static void break_cow(struct rmap_item *rmap_item) put_anon_vma(rmap_item->anon_vma); down_read(&mm->mmap_sem); - if (ksm_test_exit(mm)) - goto out; - vma = find_vma(mm, addr); - if (!vma || vma->vm_start > addr) - goto out; - if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma) - goto out; - break_ksm(vma, addr); -out: + vma = find_mergeable_vma(mm, addr); + if (vma) + break_ksm(vma, addr); up_read(&mm->mmap_sem); } @@ -421,12 +429,8 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item) struct page *page; down_read(&mm->mmap_sem); - if (ksm_test_exit(mm)) - goto out; - vma = find_vma(mm, addr); - if (!vma || vma->vm_start > addr) - goto out; - if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma) + vma = find_mergeable_vma(mm, addr); + if (!vma) goto out; page = follow_page(vma, addr, FOLL_GET);