From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
If we're punching a hole in a THP, we need to remove the per-page iomap
data, but not clear the dirty bit from the page, so separate the two
conditions. This means that writepage can now come across a page with
no iop allocated, so remove the assertions that there is already one,
and just create one if there isn't one.
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
fs/iomap/buffered-io.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 1b450e966822..b1a2ab2c7a8d 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -487,17 +487,21 @@ EXPORT_SYMBOL_GPL(iomap_releasepage);
void
iomap_invalidatepage(struct page *page, unsigned int offset, unsigned int len)
{
+ bool full_page = (offset == 0) && (len == thp_size(page));
trace_iomap_invalidatepage(page->mapping->host, offset, len);
/*
* If we are invalidating the entire page, clear the dirty state from it
* and release it to avoid unnecessary buildup of the LRU.
*/
- if (offset == 0 && len == PAGE_SIZE) {
+ if (full_page) {
WARN_ON_ONCE(PageWriteback(page));
cancel_dirty_page(page);
- iomap_page_release(page);
}
+
+ /* Punching a hole in a THP requires releasing the iop */
+ if (full_page || thp_order(page) > 0)
+ iomap_page_release(page);
}
EXPORT_SYMBOL_GPL(iomap_invalidatepage);
@@ -1064,14 +1068,13 @@ static void
iomap_finish_page_writeback(struct inode *inode, struct page *page,
int error)
{
- struct iomap_page *iop = to_iomap_page(page);
+ struct iomap_page *iop = iomap_page_create(inode, page);
if (error) {
SetPageError(page);
mapping_set_error(inode->i_mapping, -EIO);
}
- WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop);
WARN_ON_ONCE(iop && atomic_read(&iop->write_count) <= 0);
if (!iop || atomic_dec_and_test(&iop->write_count))
@@ -1360,14 +1363,13 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
struct writeback_control *wbc, struct inode *inode,
struct page *page, u64 end_offset)
{
- struct iomap_page *iop = to_iomap_page(page);
+ struct iomap_page *iop = iomap_page_create(inode, page);
struct iomap_ioend *ioend, *next;
unsigned len = i_blocksize(inode);
u64 file_offset; /* file offset of page */
int error = 0, count = 0, i;
LIST_HEAD(submit_list);
- WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop);
WARN_ON_ONCE(iop && atomic_read(&iop->write_count) != 0);
/*
--
2.26.2
