Commit 08b52706 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds

mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()

The comment in commit 4fc3f1d6 ("mm/rmap, migration: Make
rmap_walk_anon() and try_to_unmap_anon() more scalable") says:

| Rename anon_vma_[un]lock() => anon_vma_[un]lock_write(),
| to make it clearer that it's an exclusive write-lock in
| that case - suggested by Rik van Riel.

But that commit renames only anon_vma_lock()
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Ingo Molnar <mingo@kernel.org>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ec8acf20
...@@ -113,7 +113,7 @@ extern void __split_huge_page_pmd(struct vm_area_struct *vma, ...@@ -113,7 +113,7 @@ extern void __split_huge_page_pmd(struct vm_area_struct *vma,
do { \ do { \
pmd_t *____pmd = (__pmd); \ pmd_t *____pmd = (__pmd); \
anon_vma_lock_write(__anon_vma); \ anon_vma_lock_write(__anon_vma); \
anon_vma_unlock(__anon_vma); \ anon_vma_unlock_write(__anon_vma); \
BUG_ON(pmd_trans_splitting(*____pmd) || \ BUG_ON(pmd_trans_splitting(*____pmd) || \
pmd_trans_huge(*____pmd)); \ pmd_trans_huge(*____pmd)); \
} while (0) } while (0)
......
...@@ -123,7 +123,7 @@ static inline void anon_vma_lock_write(struct anon_vma *anon_vma) ...@@ -123,7 +123,7 @@ static inline void anon_vma_lock_write(struct anon_vma *anon_vma)
down_write(&anon_vma->root->rwsem); down_write(&anon_vma->root->rwsem);
} }
static inline void anon_vma_unlock(struct anon_vma *anon_vma) static inline void anon_vma_unlock_write(struct anon_vma *anon_vma)
{ {
up_write(&anon_vma->root->rwsem); up_write(&anon_vma->root->rwsem);
} }
......
...@@ -1830,7 +1830,7 @@ int split_huge_page(struct page *page) ...@@ -1830,7 +1830,7 @@ int split_huge_page(struct page *page)
BUG_ON(PageCompound(page)); BUG_ON(PageCompound(page));
out_unlock: out_unlock:
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
put_anon_vma(anon_vma); put_anon_vma(anon_vma);
out: out:
return ret; return ret;
...@@ -2322,7 +2322,7 @@ static void collapse_huge_page(struct mm_struct *mm, ...@@ -2322,7 +2322,7 @@ static void collapse_huge_page(struct mm_struct *mm,
BUG_ON(!pmd_none(*pmd)); BUG_ON(!pmd_none(*pmd));
set_pmd_at(mm, address, pmd, _pmd); set_pmd_at(mm, address, pmd, _pmd);
spin_unlock(&mm->page_table_lock); spin_unlock(&mm->page_table_lock);
anon_vma_unlock(vma->anon_vma); anon_vma_unlock_write(vma->anon_vma);
goto out; goto out;
} }
...@@ -2330,7 +2330,7 @@ static void collapse_huge_page(struct mm_struct *mm, ...@@ -2330,7 +2330,7 @@ static void collapse_huge_page(struct mm_struct *mm,
* All pages are isolated and locked so anon_vma rmap * All pages are isolated and locked so anon_vma rmap
* can't run anymore. * can't run anymore.
*/ */
anon_vma_unlock(vma->anon_vma); anon_vma_unlock_write(vma->anon_vma);
__collapse_huge_page_copy(pte, new_page, vma, address, ptl); __collapse_huge_page_copy(pte, new_page, vma, address, ptl);
pte_unmap(pte); pte_unmap(pte);
......
...@@ -809,7 +809,7 @@ again: remove_next = 1 + (end > next->vm_end); ...@@ -809,7 +809,7 @@ again: remove_next = 1 + (end > next->vm_end);
anon_vma_interval_tree_post_update_vma(vma); anon_vma_interval_tree_post_update_vma(vma);
if (adjust_next) if (adjust_next)
anon_vma_interval_tree_post_update_vma(next); anon_vma_interval_tree_post_update_vma(next);
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
} }
if (mapping) if (mapping)
mutex_unlock(&mapping->i_mmap_mutex); mutex_unlock(&mapping->i_mmap_mutex);
...@@ -3017,7 +3017,7 @@ static void vm_unlock_anon_vma(struct anon_vma *anon_vma) ...@@ -3017,7 +3017,7 @@ static void vm_unlock_anon_vma(struct anon_vma *anon_vma)
if (!__test_and_clear_bit(0, (unsigned long *) if (!__test_and_clear_bit(0, (unsigned long *)
&anon_vma->root->rb_root.rb_node)) &anon_vma->root->rb_root.rb_node))
BUG(); BUG();
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
} }
} }
......
...@@ -135,7 +135,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, ...@@ -135,7 +135,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
pte_unmap(new_pte - 1); pte_unmap(new_pte - 1);
pte_unmap_unlock(old_pte - 1, old_ptl); pte_unmap_unlock(old_pte - 1, old_ptl);
if (anon_vma) if (anon_vma)
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
if (mapping) if (mapping)
mutex_unlock(&mapping->i_mmap_mutex); mutex_unlock(&mapping->i_mmap_mutex);
} }
......
...@@ -105,7 +105,7 @@ static inline void anon_vma_free(struct anon_vma *anon_vma) ...@@ -105,7 +105,7 @@ static inline void anon_vma_free(struct anon_vma *anon_vma)
*/ */
if (rwsem_is_locked(&anon_vma->root->rwsem)) { if (rwsem_is_locked(&anon_vma->root->rwsem)) {
anon_vma_lock_write(anon_vma); anon_vma_lock_write(anon_vma);
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
} }
kmem_cache_free(anon_vma_cachep, anon_vma); kmem_cache_free(anon_vma_cachep, anon_vma);
...@@ -191,7 +191,7 @@ int anon_vma_prepare(struct vm_area_struct *vma) ...@@ -191,7 +191,7 @@ int anon_vma_prepare(struct vm_area_struct *vma)
avc = NULL; avc = NULL;
} }
spin_unlock(&mm->page_table_lock); spin_unlock(&mm->page_table_lock);
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
if (unlikely(allocated)) if (unlikely(allocated))
put_anon_vma(allocated); put_anon_vma(allocated);
...@@ -308,7 +308,7 @@ int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma) ...@@ -308,7 +308,7 @@ int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
vma->anon_vma = anon_vma; vma->anon_vma = anon_vma;
anon_vma_lock_write(anon_vma); anon_vma_lock_write(anon_vma);
anon_vma_chain_link(vma, avc, anon_vma); anon_vma_chain_link(vma, avc, anon_vma);
anon_vma_unlock(anon_vma); anon_vma_unlock_write(anon_vma);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment