Author: markj
Date: Tue Feb 3 05:38:52 2015
New Revision: 278136
URL: https://svnweb.freebsd.org/changeset/base/278136
Log:
Diff reduction with illumos, in preparation for merging r266993 from the
vendor branch. No functional change.
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb
3 03:14:17 2015 (r278135)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb
3 05:38:52 2015 (r278136)
@@ -16841,23 +16841,20 @@ dtrace_dtr(void *data)
mutex_enter(&cpu_lock);
mutex_enter(&dtrace_lock);
- if (state != NULL) {
- if (state->dts_anon) {
- /*
- * There is anonymous state. Destroy that first.
- */
- ASSERT(dtrace_anon.dta_state == NULL);
- dtrace_state_destroy(state->dts_anon);
- }
-
- dtrace_state_destroy(state);
+ if (state->dts_anon) {
+ /*
+ * There is anonymous state. Destroy that first.
+ */
+ ASSERT(dtrace_anon.dta_state == NULL);
+ dtrace_state_destroy(state->dts_anon);
+ }
+ dtrace_state_destroy(state);
#ifndef illumos
- kmem_free(state, 0);
+ kmem_free(state, 0);
#endif
- }
-
ASSERT(dtrace_opens > 0);
+
#ifdef illumos
/*
* Only relinquish control of the kernel debugger interface when there
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
