svn commit: r229568 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Thu Jan  5 10:03:14 2012
New Revision: 229568
URL: http://svn.freebsd.org/changeset/base/229568

Log:
  MFC r228363, r228392:
  
  MFC r228363 (pjd):
  The vfs.zfs.txg.timeout sysctl can be safely modified at run time.
  
  MFC r228392 (pjd) [1]:
  Move ru_inblock increment into arc_read_nolock() so we don't account for
  cached reads.
  
  Discussed with:		gibbs
  No objections from:	avg
  Tested by:		Marcus Reid <marcus at blazingdot.com> [1]
  Approved by:		pjd

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Jan  5 09:50:47 2012	(r229567)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Jan  5 10:03:14 2012	(r229568)
@@ -3103,6 +3103,9 @@ top:
 		ARCSTAT_CONDSTAT(!(hdr->b_flags & ARC_PREFETCH),
 		    demand, prefetch, hdr->b_type != ARC_BUFC_METADATA,
 		    data, metadata, misses);
+#ifdef _KERNEL
+		curthread->td_ru.ru_inblock++;
+#endif
 
 		if (vd != NULL && l2arc_ndev != 0 && !(l2arc_norw && devw)) {
 			/*

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Thu Jan  5 09:50:47 2012	(r229567)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Thu Jan  5 10:03:14 2012	(r229568)
@@ -627,10 +627,6 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio
 	} else if (db->db_state == DB_UNCACHED) {
 		spa_t *spa = dn->dn_objset->os_spa;
 
-#ifdef _KERNEL
-		curthread->td_ru.ru_inblock++;
-#endif
-
 		if (zio == NULL)
 			zio = zio_root(spa, NULL, NULL, ZIO_FLAG_CANFAIL);
 		dbuf_read_impl(db, zio, &flags);

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Thu Jan  5 09:50:47 2012	(r229567)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Thu Jan  5 10:03:14 2012	(r229568)
@@ -43,7 +43,7 @@ int zfs_txg_timeout = 5;	/* max seconds 
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, txg, CTLFLAG_RW, 0, "ZFS TXG");
 TUNABLE_INT("vfs.zfs.txg.timeout", &zfs_txg_timeout);
-SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, timeout, CTLFLAG_RDTUN, &zfs_txg_timeout, 0,
+SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, timeout, CTLFLAG_RW, &zfs_txg_timeout, 0,
     "Maximum seconds worth of delta per txg");
 
 /*