svn commit: r294625 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Jan 23 12:13:09 2016
New Revision: 294625
URL: https://svnweb.freebsd.org/changeset/base/294625

Log:
  Fix ru_oublocks accounting for ZFS. There are two code paths that can be
  called from zfs_write() - one of them, through dmu_write(), was handled
  correctly; the other wasn't.
  
  Reviewed by:	avg@
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D4923

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Sat Jan 23 12:10:16 2016	(r294624)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Sat Jan 23 12:13:09 2016	(r294625)
@@ -1420,6 +1420,9 @@ dmu_assign_arcbuf(dmu_buf_t *handle, uin
 	 */
 	if (offset == db->db.db_offset && blksz == db->db.db_size &&
 	    DBUF_GET_BUFC_TYPE(db) == ARC_BUFC_DATA) {
+#ifdef _KERNEL
+		curthread->td_ru.ru_oublock++;
+#endif
 		dbuf_assign_arcbuf(db, buf, tx);
 		dbuf_rele(db, FTAG);
 	} else {