Author: avg
Date: Wed May  4 11:40:13 2016
New Revision: 299061
URL: https://svnweb.freebsd.org/changeset/base/299061

Log:
  MFC r297812: zio: align use of "no dump" flag between use_uma and !use_uma 
cases

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c      Wed May 
 4 08:57:40 2016        (r299060)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c      Wed May 
 4 11:40:13 2016        (r299061)
@@ -133,11 +133,13 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, sync_pass
 
 boolean_t      zio_requeue_io_start_cut_in_line = B_TRUE;
 
+#ifdef illumos
 #ifdef ZFS_DEBUG
 int zio_buf_debug_limit = 16384;
 #else
 int zio_buf_debug_limit = 0;
 #endif
+#endif
 
 void
 zio_init(void)
@@ -159,7 +161,7 @@ zio_init(void)
                size_t size = (c + 1) << SPA_MINBLOCKSHIFT;
                size_t p2 = size;
                size_t align = 0;
-               size_t cflags = (size > zio_buf_debug_limit) ? KMC_NODEBUG : 0;
+               int cflags = zio_exclude_metadata ? KMC_NODEBUG : 0;
 
                while (!ISP2(p2))
                        p2 &= p2 - 1;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to