Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 08b52706d505658eac0962d215ff697f898bbc13

Authored by Konstantin Khlebnikov
Committed by Linus Torvalds
1 parent ec8acf20af
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 6 changed files with 11 additions and 11 deletions Side-by-side Diff

include/linux/huge_mm.h
Diff comments   View file @ 08b5270
... ... @@ -113,7 +113,7 @@
113 113 do { \
114 114 pmd_t *____pmd = (__pmd); \
115 115 anon_vma_lock_write(__anon_vma); \
116   - anon_vma_unlock(__anon_vma); \
  116 + anon_vma_unlock_write(__anon_vma); \
117 117 BUG_ON(pmd_trans_splitting(*____pmd) || \
118 118 pmd_trans_huge(*____pmd)); \
119 119 } while (0)
include/linux/rmap.h
Diff comments   View file @ 08b5270
... ... @@ -123,7 +123,7 @@
123 123 down_write(&anon_vma->root->rwsem);
124 124 }
125 125  
126   -static inline void anon_vma_unlock(struct anon_vma *anon_vma)
  126 +static inline void anon_vma_unlock_write(struct anon_vma *anon_vma)
127 127 {
128 128 up_write(&anon_vma->root->rwsem);
129 129 }
... ... @@ -1830,7 +1830,7 @@
1830 1830  
1831 1831 BUG_ON(PageCompound(page));
1832 1832 out_unlock:
1833   - anon_vma_unlock(anon_vma);
  1833 + anon_vma_unlock_write(anon_vma);
1834 1834 put_anon_vma(anon_vma);
1835 1835 out:
1836 1836 return ret;
... ... @@ -2322,7 +2322,7 @@
2322 2322 BUG_ON(!pmd_none(*pmd));
2323 2323 set_pmd_at(mm, address, pmd, _pmd);
2324 2324 spin_unlock(&mm->page_table_lock);
2325   - anon_vma_unlock(vma->anon_vma);
  2325 + anon_vma_unlock_write(vma->anon_vma);
2326 2326 goto out;
2327 2327 }
2328 2328  
... ... @@ -2330,7 +2330,7 @@
2330 2330 * All pages are isolated and locked so anon_vma rmap
2331 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 2335 __collapse_huge_page_copy(pte, new_page, vma, address, ptl);
2336 2336 pte_unmap(pte);
... ... @@ -809,7 +809,7 @@
809 809 anon_vma_interval_tree_post_update_vma(vma);
810 810 if (adjust_next)
811 811 anon_vma_interval_tree_post_update_vma(next);
812   - anon_vma_unlock(anon_vma);
  812 + anon_vma_unlock_write(anon_vma);
813 813 }
814 814 if (mapping)
815 815 mutex_unlock(&mapping->i_mmap_mutex);
... ... @@ -3017,7 +3017,7 @@
3017 3017 if (!__test_and_clear_bit(0, (unsigned long *)
3018 3018 &anon_vma->root->rb_root.rb_node))
3019 3019 BUG();
3020   - anon_vma_unlock(anon_vma);
  3020 + anon_vma_unlock_write(anon_vma);
3021 3021 }
3022 3022 }
3023 3023  
... ... @@ -135,7 +135,7 @@
135 135 pte_unmap(new_pte - 1);
136 136 pte_unmap_unlock(old_pte - 1, old_ptl);
137 137 if (anon_vma)
138   - anon_vma_unlock(anon_vma);
  138 + anon_vma_unlock_write(anon_vma);
139 139 if (mapping)
140 140 mutex_unlock(&mapping->i_mmap_mutex);
141 141 }
... ... @@ -105,7 +105,7 @@
105 105 */
106 106 if (rwsem_is_locked(&anon_vma->root->rwsem)) {
107 107 anon_vma_lock_write(anon_vma);
108   - anon_vma_unlock(anon_vma);
  108 + anon_vma_unlock_write(anon_vma);
109 109 }
110 110  
111 111 kmem_cache_free(anon_vma_cachep, anon_vma);
... ... @@ -191,7 +191,7 @@
191 191 avc = NULL;
192 192 }
193 193 spin_unlock(&mm->page_table_lock);
194   - anon_vma_unlock(anon_vma);
  194 + anon_vma_unlock_write(anon_vma);
195 195  
196 196 if (unlikely(allocated))
197 197 put_anon_vma(allocated);
... ... @@ -308,7 +308,7 @@
308 308 vma->anon_vma = anon_vma;
309 309 anon_vma_lock_write(anon_vma);
310 310 anon_vma_chain_link(vma, avc, anon_vma);
311   - anon_vma_unlock(anon_vma);
  311 + anon_vma_unlock_write(anon_vma);
312 312  
313 313 return 0;
314 314