Author: markj
Date: Fri Mar 6 14:56:47 2020
New Revision: 358705
URL: https://svnweb.freebsd.org/changeset/base/358705
Log:
MFC r358435:
Do not load dtraceall.ko if dtrace.ko is already loaded.
Modified:
stable/12/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- stable/12/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Mar
6 14:56:02 2020 (r358704)
+++ stable/12/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Mar
6 14:56:47 2020 (r358705)
@@ -1105,7 +1105,7 @@ dt_vopen(int version, int flags, int *errp,
dt_provmod_open(&provmod, &df);
dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
- err = errno; /* save errno from opening dtfd */
+ err = dtfd == -1 ? errno : 0; /* save errno from opening dtfd */
#if defined(__FreeBSD__)
/*
* Automatically load the 'dtraceall' module if we couldn't open the
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
