Date: Mon, 2 Feb 2015 00:17:37 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201502020017.t120Hb2g095087@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Mon Feb 2 00:17:36 2015 New Revision: 278040 URL: https://svnweb.freebsd.org/changeset/base/278040 Log: Prevent inlining txg_quiesce This allows dtrace to monitor the calls to txg_quiesce which can be really helpful. Also standardise __noinline order for arc_kmem_reap_now. Sponsored by: Multiplay Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Feb 1 23:19:06 2015 (r278039) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Feb 2 00:17:36 2015 (r278040) @@ -2677,7 +2677,7 @@ extern kmem_cache_t *zio_buf_cache[]; extern kmem_cache_t *zio_data_buf_cache[]; extern kmem_cache_t *range_seg_cache; -static void __noinline +static __noinline void arc_kmem_reap_now(arc_reclaim_strategy_t strat) { size_t i; Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Sun Feb 1 23:19:06 2015 (r278039) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Mon Feb 2 00:17:36 2015 (r278040) @@ -353,7 +353,7 @@ txg_rele_to_sync(txg_handle_t *th) * On return, the transaction group has reached a stable state in which it can * then be passed off to the syncing context. */ -static void +static __noinline void txg_quiesce(dsl_pool_t *dp, uint64_t txg) { tx_state_t *tx = &dp->dp_tx;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502020017.t120Hb2g095087>