From 5a178afd414de3f945106d495573d0f79ced4e2d Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Wed, 2 Jul 2014 21:25:32 +0000 Subject: [PATCH] Fix bug in sync control in new "dev" mode of ZVOL (r265678). Don't check ZVOL_WCE flag, used in Solaris to control device "write cache". It is not applicable on FreeBSD and by default set to "disable". MFC after: 3 days --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c index 0c573b261d68..a334f398f9fd 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c @@ -1629,7 +1629,11 @@ zvol_write(struct cdev *dev, struct uio *uio, int ioflag) } #endif +#ifdef sun sync = !(zv->zv_flags & ZVOL_WCE) || +#else + sync = +#endif (zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS); rl = zfs_range_lock(&zv->zv_znode, uio->uio_loffset, uio->uio_resid,