diff options
author | Hillf Danton <dhillf@gmail.com> | 2013-04-29 18:06:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:54:28 -0400 |
commit | 369a713e9678227e203b53931ad1a10cd8eac811 (patch) | |
tree | dfb1903567ad4fe10c297167f3b1345e64e1e4cd /mm/rmap.c | |
parent | 8375ad98cc1defc36adf4a77d9ea1e71db51a371 (diff) |
rmap: recompute pgoff for unmapping huge page
We have to recompute pgoff if the given page is huge, since result based
on HPAGE_SIZE is not approapriate for scanning the vma interval tree, as
shown by commit 36e4f20af833 ("hugetlb: do not use vma_hugecache_offset()
for vma_prio_tree_foreach").
Signed-off-by: Hillf Danton <dhillf@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Michel Lespinasse <walken@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/rmap.c')
-rw-r--r-- | mm/rmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1513,6 +1513,9 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags) | |||
1513 | unsigned long max_nl_size = 0; | 1513 | unsigned long max_nl_size = 0; |
1514 | unsigned int mapcount; | 1514 | unsigned int mapcount; |
1515 | 1515 | ||
1516 | if (PageHuge(page)) | ||
1517 | pgoff = page->index << compound_order(page); | ||
1518 | |||
1516 | mutex_lock(&mapping->i_mmap_mutex); | 1519 | mutex_lock(&mapping->i_mmap_mutex); |
1517 | vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { | 1520 | vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { |
1518 | unsigned long address = vma_address(page, vma); | 1521 | unsigned long address = vma_address(page, vma); |