mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 03:08:51 +03:00
Revert "Avoid BUG in migrate_folio_extra"
This reverts commit b052035990.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Signed-off-by: tstabrawa <59430211+tstabrawa@users.noreply.github.com>
Closes #16568
Closes #16723
This commit is contained in:
committed by
Brian Behlendorf
parent
60c202cca4
commit
f38e2d239f
@@ -260,15 +260,6 @@ update_pages(znode_t *zp, int64_t start, int len, objset_t *os)
|
||||
} else {
|
||||
ClearPageError(pp);
|
||||
SetPageUptodate(pp);
|
||||
if (!PagePrivate(pp)) {
|
||||
/*
|
||||
* Set private bit so page migration
|
||||
* will wait for us to finish writeback
|
||||
* before calling migrate_folio().
|
||||
*/
|
||||
SetPagePrivate(pp);
|
||||
get_page(pp);
|
||||
}
|
||||
|
||||
if (mapping_writably_mapped(mp))
|
||||
flush_dcache_page(pp);
|
||||
@@ -4090,14 +4081,6 @@ zfs_fillpage(struct inode *ip, struct page *pp)
|
||||
} else {
|
||||
ClearPageError(pp);
|
||||
SetPageUptodate(pp);
|
||||
if (!PagePrivate(pp)) {
|
||||
/*
|
||||
* Set private bit so page migration will wait for us to
|
||||
* finish writeback before calling migrate_folio().
|
||||
*/
|
||||
SetPagePrivate(pp);
|
||||
get_page(pp);
|
||||
}
|
||||
}
|
||||
|
||||
return (error);
|
||||
|
||||
Reference in New Issue
Block a user