Author: mav
Date: Wed Jul  2 21:25:32 2014
New Revision: 268178
URL: http://svnweb.freebsd.org/changeset/base/268178

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

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c  Wed Jul  2 
21:24:54 2014        (r268177)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c  Wed Jul  2 
21:25:32 2014        (r268178)
@@ -1629,7 +1629,11 @@ zvol_write(struct cdev *dev, struct uio 
        }
 #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,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to