diff options
| author | Andrea Arcangeli | 2012-03-28 23:42:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-03-29 02:14:35 +0200 |
| commit | 45f83cefe3a5f0476ac3f96382ebfdc3fe4caab2 (patch) | |
| tree | b2f7d3c02923d89db5a551c6a7923121db9610c4 /mm/memcontrol.c | |
| parent | mm for fs: add truncate_pagecache_range() (diff) | |
| download | kernel-qcow2-linux-45f83cefe3a5f0476ac3f96382ebfdc3fe4caab2.tar.gz kernel-qcow2-linux-45f83cefe3a5f0476ac3f96382ebfdc3fe4caab2.tar.xz kernel-qcow2-linux-45f83cefe3a5f0476ac3f96382ebfdc3fe4caab2.zip | |
mm: thp: fix up pmd_trans_unstable() locations
pmd_trans_unstable() should be called before pmd_offset_map() in the
locations where the mmap_sem is held for reading.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Cc: Larry Woodman <lwoodman@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mark Salter <msalter@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b2ee6df0e9bb..7d698df4a067 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5306,6 +5306,8 @@ static int mem_cgroup_count_precharge_pte_range(pmd_t *pmd, return 0; } + if (pmd_trans_unstable(pmd)) + return 0; pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); for (; addr != end; pte++, addr += PAGE_SIZE) if (get_mctgt_type(vma, addr, *pte, NULL)) @@ -5502,6 +5504,8 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, return 0; } + if (pmd_trans_unstable(pmd)) + return 0; retry: pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); for (; addr != end; addr += PAGE_SIZE) { |