|
@@ -155,10 +155,14 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
|
|
|
|
|
|
int truncate_inode_page(struct address_space *mapping, struct page *page)
|
|
int truncate_inode_page(struct address_space *mapping, struct page *page)
|
|
{
|
|
{
|
|
|
|
+ loff_t holelen;
|
|
|
|
+ VM_BUG_ON_PAGE(PageTail(page), page);
|
|
|
|
+
|
|
|
|
+ holelen = PageTransHuge(page) ? HPAGE_PMD_SIZE : PAGE_SIZE;
|
|
if (page_mapped(page)) {
|
|
if (page_mapped(page)) {
|
|
unmap_mapping_range(mapping,
|
|
unmap_mapping_range(mapping,
|
|
(loff_t)page->index << PAGE_SHIFT,
|
|
(loff_t)page->index << PAGE_SHIFT,
|
|
- PAGE_SIZE, 0);
|
|
|
|
|
|
+ holelen, 0);
|
|
}
|
|
}
|
|
return truncate_complete_page(mapping, page);
|
|
return truncate_complete_page(mapping, page);
|
|
}
|
|
}
|
|
@@ -279,7 +283,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
|
|
|
|
|
|
if (!trylock_page(page))
|
|
if (!trylock_page(page))
|
|
continue;
|
|
continue;
|
|
- WARN_ON(page->index != index);
|
|
|
|
|
|
+ WARN_ON(page_to_pgoff(page) != index);
|
|
if (PageWriteback(page)) {
|
|
if (PageWriteback(page)) {
|
|
unlock_page(page);
|
|
unlock_page(page);
|
|
continue;
|
|
continue;
|
|
@@ -367,7 +371,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
|
|
}
|
|
}
|
|
|
|
|
|
lock_page(page);
|
|
lock_page(page);
|
|
- WARN_ON(page->index != index);
|
|
|
|
|
|
+ WARN_ON(page_to_pgoff(page) != index);
|
|
wait_on_page_writeback(page);
|
|
wait_on_page_writeback(page);
|
|
truncate_inode_page(mapping, page);
|
|
truncate_inode_page(mapping, page);
|
|
unlock_page(page);
|
|
unlock_page(page);
|
|
@@ -487,7 +491,21 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
|
|
|
|
|
|
if (!trylock_page(page))
|
|
if (!trylock_page(page))
|
|
continue;
|
|
continue;
|
|
- WARN_ON(page->index != index);
|
|
|
|
|
|
+
|
|
|
|
+ WARN_ON(page_to_pgoff(page) != index);
|
|
|
|
+
|
|
|
|
+ /* Middle of THP: skip */
|
|
|
|
+ if (PageTransTail(page)) {
|
|
|
|
+ unlock_page(page);
|
|
|
|
+ continue;
|
|
|
|
+ } else if (PageTransHuge(page)) {
|
|
|
|
+ index += HPAGE_PMD_NR - 1;
|
|
|
|
+ i += HPAGE_PMD_NR - 1;
|
|
|
|
+ /* 'end' is in the middle of THP */
|
|
|
|
+ if (index == round_down(end, HPAGE_PMD_NR))
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
ret = invalidate_inode_page(page);
|
|
ret = invalidate_inode_page(page);
|
|
unlock_page(page);
|
|
unlock_page(page);
|
|
/*
|
|
/*
|
|
@@ -594,7 +612,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
|
|
}
|
|
}
|
|
|
|
|
|
lock_page(page);
|
|
lock_page(page);
|
|
- WARN_ON(page->index != index);
|
|
|
|
|
|
+ WARN_ON(page_to_pgoff(page) != index);
|
|
if (page->mapping != mapping) {
|
|
if (page->mapping != mapping) {
|
|
unlock_page(page);
|
|
unlock_page(page);
|
|
continue;
|
|
continue;
|