Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Mar 2019 09:11:46 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r345410 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Message-ID:  <201903220911.x2M9BkRX089063@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Fri Mar 22 09:11:45 2019
New Revision: 345410
URL: https://svnweb.freebsd.org/changeset/base/345410

Log:
  ZFS vdev_file: use correct value for waitfor parameter of VOP_FSYNC
  
  PR:		236475
  Reported by:	asomers
  MFC after:	2 weeks

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 07:39:28 2019	(r345409)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c	Fri Mar 22 09:11:45 2019	(r345410)
@@ -239,8 +239,13 @@ 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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903220911.x2M9BkRX089063>