svn commit: r285717 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Josh Paetzel]

Author: jpaetzel
Date: Mon Jul 20 14:38:40 2015
New Revision: 285717
URL: https://svnweb.freebsd.org/changeset/base/285717

Log:
  MFC 278040:
  
  Prevent inlining txg_quiesce
  
  This allows dtrace to monitor the calls to txg_quiesce which can be
  really helpful.
  
  Also standardize __noinline order for arc_kmem_reap_now.
  
  Sponsored by:	Multiplay
  
  Approved by:	re

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Jul 20 13:46:22 2015	(r285716)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Jul 20 14:38:40 2015	(r285717)
@@ -2645,7 +2645,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: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Mon Jul 20 13:46:22 2015	(r285716)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	Mon Jul 20 14:38:40 2015	(r285717)
@@ -354,7 +354,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;