Author: mav
Date: Sat Jul  5 01:14:14 2014
New Revision: 268274
URL: http://svnweb.freebsd.org/changeset/base/268274

Log:
  MFC r268178:
  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".

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c     Fri Jul 
 4 22:47:07 2014        (r268273)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c     Sat Jul 
 5 01:14:14 2014        (r268274)
@@ -1628,7 +1628,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-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to