aboutsummaryrefslogtreecommitdiffstats
path: root/mm/huge_memory.c
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <khlebnikov@openvz.org>2013-02-22 19:34:40 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-23 20:50:17 -0500
commit08b52706d505658eac0962d215ff697f898bbc13 (patch)
treeb732ff7986179ab4e767ccbf5f6909a67cdb03c3 /mm/huge_memory.c
parentec8acf20afb8534ed511f6613dd2226b9e301010 (diff)
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
The comment in commit 4fc3f1d66b1e ("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: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: Ingo Molnar <mingo@kernel.org> Reviewed-by: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r--mm/huge_memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index f40b2ce23d60..b1cc6591ed83 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1830,7 +1830,7 @@ int split_huge_page(struct page *page)
1830 1830
1831 BUG_ON(PageCompound(page)); 1831 BUG_ON(PageCompound(page));
1832out_unlock: 1832out_unlock:
1833 anon_vma_unlock(anon_vma); 1833 anon_vma_unlock_write(anon_vma);
1834 put_anon_vma(anon_vma); 1834 put_anon_vma(anon_vma);
1835out: 1835out:
1836 return ret; 1836 return ret;
@@ -2322,7 +2322,7 @@ static void collapse_huge_page(struct mm_struct *mm,
2322 BUG_ON(!pmd_none(*pmd)); 2322 BUG_ON(!pmd_none(*pmd));
2323 set_pmd_at(mm, address, pmd, _pmd); 2323 set_pmd_at(mm, address, pmd, _pmd);
2324 spin_unlock(&mm->page_table_lock); 2324 spin_unlock(&mm->page_table_lock);
2325 anon_vma_unlock(vma->anon_vma); 2325 anon_vma_unlock_write(vma->anon_vma);
2326 goto out; 2326 goto out;
2327 } 2327 }
2328 2328
@@ -2330,7 +2330,7 @@ static void collapse_huge_page(struct mm_struct *mm,
2330 * All pages are isolated and locked so anon_vma rmap 2330 * All pages are isolated and locked so anon_vma rmap
2331 * can't run anymore. 2331 * can't run anymore.
2332 */ 2332 */
2333 anon_vma_unlock(vma->anon_vma); 2333 anon_vma_unlock_write(vma->anon_vma);
2334 2334
2335 __collapse_huge_page_copy(pte, new_page, vma, address, ptl); 2335 __collapse_huge_page_copy(pte, new_page, vma, address, ptl);
2336 pte_unmap(pte); 2336 pte_unmap(pte);