From c9511b5db6f8d55ebcb32af82fc11247328c6b84 Mon Sep 17 00:00:00 2001 From: avg Date: Fri, 22 Mar 2019 17:44:47 +0000 Subject: [PATCH] Revert r345410, VOP_FSYNC change in ZFS vdev_file I overlooked the fact that that VOP_FSYNC() call is not a FreeBSD VFS call, but a macro that provides an illumos-compatible wrapper for the FreeBSD operation. PR: 236475 Reported by: lwhsu Pointyhat to: avg --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c index 51ce7404ce3..6cc5343b5e6 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c @@ -239,13 +239,8 @@ vdev_file_io_start(zio_t *zio) switch (zio->io_cmd) { case DKIOCFLUSHWRITECACHE: -#ifdef illumos zio->io_error = VOP_FSYNC(vf->vf_vnode, FSYNC | FDSYNC, kcred, NULL); -#else - zio->io_error = VOP_FSYNC(vf->vf_vnode, MNT_WAIT, - kcred, NULL); -#endif break; default: zio->io_error = SET_ERROR(ENOTSUP); -- 2.45.0