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

[Will Andrews]

Author: will
Date: Tue Jan 20 22:39:10 2015
New Revision: 277452
URL: https://svnweb.freebsd.org/changeset/base/277452

Log:
  Fix arc__shrink DTrace probe's to_free argument.
  
  Remove the unnecessary #ifdef _KERNEL, which did not differ in the true or
  false cases.  Actually set the value of to_free before using it.
  
  MFC after:	1 week
  Sponsored by:	Spectra Logic

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jan 20 22:33:27 2015	(r277451)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jan 20 22:39:10 2015	(r277452)
@@ -2540,13 +2540,9 @@ arc_shrink(void)
 	if (arc_c > arc_c_min) {
 		uint64_t to_free;
 
+		to_free = arc_c >> arc_shrink_shift;
 		DTRACE_PROBE4(arc__shrink, uint64_t, arc_c, uint64_t,
 			arc_c_min, uint64_t, arc_p, uint64_t, to_free);
-#ifdef _KERNEL
-		to_free = arc_c >> arc_shrink_shift;
-#else
-		to_free = arc_c >> arc_shrink_shift;
-#endif
 		if (arc_c > arc_c_min + to_free)
 			atomic_add_64(&arc_c, -to_free);
 		else