Fix corruption caused by mmap flushing problems

[mirror_zfs.git] / module / os / linux / zfs / zfs_vnops_os.c

diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c
index a32307c393314d4dc9ed6d2c608ae68b62de6d2b..1cecad9f77559164d68bfb7d0a59c35c34e2252b 100644 (file)
--- a/module/os/linux/zfs/zfs_vnops_os.c
+++ b/module/os/linux/zfs/zfs_vnops_os.c
@@ -3795,11 +3795,8 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc,
        dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
        zfs_sa_upgrade_txholds(tx, zp);
 
-       err = dmu_tx_assign(tx, TXG_NOWAIT);
+       err = dmu_tx_assign(tx, TXG_WAIT);
        if (err != 0) {
-               if (err == ERESTART)
-                       dmu_tx_wait(tx);
-
                dmu_tx_abort(tx);
 #ifdef HAVE_VFS_FILEMAP_DIRTY_FOLIO
                filemap_dirty_folio(page_mapping(pp), page_folio(pp));