Linux: use filemap_range_has_page()

[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 47f132a38abe029e849cec7b99b16c92e5626a8c..302a88c2d3535d35be4abda42e13f9d9c89c05cd 100644 (file)
--- a/module/os/linux/zfs/zfs_vnops_os.c
+++ b/module/os/linux/zfs/zfs_vnops_os.c
@@ -987,7 +987,7 @@ top:
 
        mutex_enter(&zp->z_lock);
        may_delete_now = atomic_read(&ZTOI(zp)->i_count) == 1 &&
-           !(zp->z_is_mapped);
+           !zn_has_cached_data(zp, 0, LLONG_MAX);
        mutex_exit(&zp->z_lock);
 
        /*
@@ -1075,7 +1075,8 @@ top:
                    &xattr_obj_unlinked, sizeof (xattr_obj_unlinked));
                delete_now = may_delete_now && !toobig &&
                    atomic_read(&ZTOI(zp)->i_count) == 1 &&
-                   !(zp->z_is_mapped) && xattr_obj == xattr_obj_unlinked &&
+                   !zn_has_cached_data(zp, 0, LLONG_MAX) &&
+                   xattr_obj == xattr_obj_unlinked &&
                    zfs_external_acl(zp) == acl_obj;
        }