Date: Sun, 20 Mar 2016 23:48:27 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r297091 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201603202348.u2KNmRHZ024817@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sun Mar 20 23:48:26 2016 New Revision: 297091 URL: https://svnweb.freebsd.org/changeset/base/297091 Log: MFC r294625 (by trasz): 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. Differential Revision: https://reviews.freebsd.org/D4923 Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Sun Mar 20 23:43:26 2016 (r297090) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Sun Mar 20 23:48:26 2016 (r297091) @@ -1421,6 +1421,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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603202348.u2KNmRHZ024817>