lkml.org 
[lkml]   [2010]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] do_wp_page: remove the 'reuse' flag
    Date
    Reorganize the code to remove the 'reuse' flag. No behavior changes.

    Signed-off-by: Michel Lespinasse <walken@google.com>
    ---
    mm/memory.c | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/mm/memory.c b/mm/memory.c
    index 0e18b4d..810a75f 100644
    --- a/mm/memory.c
    +++ b/mm/memory.c
    @@ -2110,7 +2110,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
    {
    struct page *old_page, *new_page;
    pte_t entry;
    - int reuse = 0, ret = 0;
    + int ret = 0;
    int page_mkwrite = 0;
    struct page *dirty_page = NULL;

    @@ -2147,14 +2147,16 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
    }
    page_cache_release(old_page);
    }
    - reuse = reuse_swap_page(old_page);
    - if (reuse)
    + if (reuse_swap_page(old_page)) {
    /*
    * The page is all ours. Move it to our anon_vma so
    * the rmap code will not search our parent or siblings.
    * Protected against the rmap code by the page lock.
    */
    page_move_anon_rmap(old_page, vma, address);
    + unlock_page(old_page);
    + goto reuse;
    + }
    unlock_page(old_page);
    } else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
    (VM_WRITE|VM_SHARED))) {
    @@ -2218,10 +2220,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
    }
    dirty_page = old_page;
    get_page(dirty_page);
    - reuse = 1;
    - }

    - if (reuse) {
    reuse:
    flush_cache_page(vma, address, pte_pfn(orig_pte));
    entry = pte_mkyoung(orig_pte);
    --
    1.7.3.1


    \
     
     \ /
      Last update: 2010-11-17 13:27    [W:0.045 / U:1.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site