svn commit: r345418 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Andriy Gapon avg at FreeBSD.org
Fri Mar 22 17:44:48 UTC 2019


Author: avg
Date: Fri Mar 22 17:44:47 2019
New Revision: 345418
URL: https://svnweb.freebsd.org/changeset/base/345418

Log:
  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

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c	Fri Mar 22 17:37:14 2019	(r345417)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c	Fri Mar 22 17:44:47 2019	(r345418)
@@ -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);


More information about the svn-src-all mailing list