Skip to content

Commit ea0f843

Browse files
author
Matthew Wilcox (Oracle)
committed
iomap: Convert iomap_page_mkwrite to use a folio
If we write to any page in a folio, we have to mark the entire folio as dirty, and potentially COW the entire folio, because it'll all get written back as one unit. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]>
1 parent 3aa9c65 commit ea0f843

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

fs/iomap/buffered-io.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -967,10 +967,9 @@ iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
967967
}
968968
EXPORT_SYMBOL_GPL(iomap_truncate_page);
969969

970-
static loff_t iomap_page_mkwrite_iter(struct iomap_iter *iter,
971-
struct page *page)
970+
static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter,
971+
struct folio *folio)
972972
{
973-
struct folio *folio = page_folio(page);
974973
loff_t length = iomap_length(iter);
975974
int ret;
976975

@@ -979,10 +978,10 @@ static loff_t iomap_page_mkwrite_iter(struct iomap_iter *iter,
979978
&iter->iomap);
980979
if (ret)
981980
return ret;
982-
block_commit_write(page, 0, length);
981+
block_commit_write(&folio->page, 0, length);
983982
} else {
984-
WARN_ON_ONCE(!PageUptodate(page));
985-
set_page_dirty(page);
983+
WARN_ON_ONCE(!folio_test_uptodate(folio));
984+
folio_mark_dirty(folio);
986985
}
987986

988987
return length;
@@ -994,24 +993,24 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
994993
.inode = file_inode(vmf->vma->vm_file),
995994
.flags = IOMAP_WRITE | IOMAP_FAULT,
996995
};
997-
struct page *page = vmf->page;
996+
struct folio *folio = page_folio(vmf->page);
998997
ssize_t ret;
999998

1000-
lock_page(page);
1001-
ret = page_mkwrite_check_truncate(page, iter.inode);
999+
folio_lock(folio);
1000+
ret = folio_mkwrite_check_truncate(folio, iter.inode);
10021001
if (ret < 0)
10031002
goto out_unlock;
1004-
iter.pos = page_offset(page);
1003+
iter.pos = folio_pos(folio);
10051004
iter.len = ret;
10061005
while ((ret = iomap_iter(&iter, ops)) > 0)
1007-
iter.processed = iomap_page_mkwrite_iter(&iter, page);
1006+
iter.processed = iomap_folio_mkwrite_iter(&iter, folio);
10081007

10091008
if (ret < 0)
10101009
goto out_unlock;
1011-
wait_for_stable_page(page);
1010+
folio_wait_stable(folio);
10121011
return VM_FAULT_LOCKED;
10131012
out_unlock:
1014-
unlock_page(page);
1013+
folio_unlock(folio);
10151014
return block_page_mkwrite_return(ret);
10161015
}
10171016
EXPORT_SYMBOL_GPL(iomap_page_mkwrite);

0 commit comments

Comments
 (0)