lkml.org 
[lkml]   [2010]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 03/28] rename anon_vma_lock to vma_lock_anon_vma
    From: Rik van Riel <riel@redhat.com>

    Rename anon_vma_lock to vma_lock_anon_vma. This matches the
    naming style used in page_lock_anon_vma and will come in really
    handy further down in this patch series.

    Signed-off-by: Rik van Riel <riel@redhat.com>
    Acked-by: Mel Gorman <mel@csn.ul.ie>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <20100526153853.55b72183@annuminas.surriel.com>
    ---
    include/linux/rmap.h | 4 ++--
    mm/mmap.c | 12 ++++++------
    2 files changed, 8 insertions(+), 8 deletions(-)

    Index: linux-2.6/include/linux/rmap.h
    ===================================================================
    --- linux-2.6.orig/include/linux/rmap.h
    +++ linux-2.6/include/linux/rmap.h
    @@ -99,14 +99,14 @@ static inline struct anon_vma *page_anon
    return page_rmapping(page);
    }

    -static inline void anon_vma_lock(struct vm_area_struct *vma)
    +static inline void vma_lock_anon_vma(struct vm_area_struct *vma)
    {
    struct anon_vma *anon_vma = vma->anon_vma;
    if (anon_vma)
    spin_lock(&anon_vma->lock);
    }

    -static inline void anon_vma_unlock(struct vm_area_struct *vma)
    +static inline void vma_unlock_anon_vma(struct vm_area_struct *vma)
    {
    struct anon_vma *anon_vma = vma->anon_vma;
    if (anon_vma)
    Index: linux-2.6/mm/mmap.c
    ===================================================================
    --- linux-2.6.orig/mm/mmap.c
    +++ linux-2.6/mm/mmap.c
    @@ -452,12 +452,12 @@ static void vma_link(struct mm_struct *m
    spin_lock(&mapping->i_mmap_lock);
    vma->vm_truncate_count = mapping->truncate_count;
    }
    - anon_vma_lock(vma);
    + vma_lock_anon_vma(vma);

    __vma_link(mm, vma, prev, rb_link, rb_parent);
    __vma_link_file(vma);

    - anon_vma_unlock(vma);
    + vma_unlock_anon_vma(vma);
    if (mapping)
    spin_unlock(&mapping->i_mmap_lock);

    @@ -1710,7 +1710,7 @@ int expand_upwards(struct vm_area_struct
    */
    if (unlikely(anon_vma_prepare(vma)))
    return -ENOMEM;
    - anon_vma_lock(vma);
    + vma_lock_anon_vma(vma);

    /*
    * vma->vm_start/vm_end cannot change under us because the caller
    @@ -1721,7 +1721,7 @@ int expand_upwards(struct vm_area_struct
    if (address < PAGE_ALIGN(address+4))
    address = PAGE_ALIGN(address+4);
    else {
    - anon_vma_unlock(vma);
    + vma_unlock_anon_vma(vma);
    return -ENOMEM;
    }
    error = 0;
    @@ -1737,7 +1737,7 @@ int expand_upwards(struct vm_area_struct
    if (!error)
    vma->vm_end = address;
    }
    - anon_vma_unlock(vma);
    + vma_unlock_anon_vma(vma);
    return error;
    }
    #endif /* CONFIG_STACK_GROWSUP || CONFIG_IA64 */
    @@ -1762,7 +1762,7 @@ static int expand_downwards(struct vm_ar
    if (error)
    return error;

    - anon_vma_lock(vma);
    + vma_lock_anon_vma(vma);

    /*
    * vma->vm_start/vm_end cannot change under us because the caller



    \
     
     \ /
      Last update: 2010-06-07 13:27    [W:4.373 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site