Author: pjd
Date: Sat Dec 10 13:02:52 2011
New Revision: 228392
URL: http://svn.freebsd.org/changeset/base/228392
Log:
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 <mar...@blazingdot.com>
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Dec 10
10:52:54 2011 (r228391)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Dec 10
13:02:52 2011 (r228392)
@@ -3105,6 +3105,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: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Sat Dec 10
10:52:54 2011 (r228391)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Sat Dec 10
13:02:52 2011 (r228392)
@@ -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);
_______________________________________________
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"
