Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/dev/dtrace Fix dtrace module autoload.



details:   https://anonhg.NetBSD.org/src/rev/78cacf630644
branches:  trunk
changeset: 338946:78cacf630644
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jun 19 02:33:00 2015 +0000

description:
Fix dtrace module autoload.

diffstat:

 external/cddl/osnet/dev/dtrace/dtrace_ioctl.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r f8cd4fb8d7d5 -r 78cacf630644 external/cddl/osnet/dev/dtrace/dtrace_ioctl.c
--- a/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c     Thu Jun 18 22:29:12 2015 +0000
+++ b/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c     Fri Jun 19 02:33:00 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dtrace_ioctl.c,v 1.4 2013/03/03 18:16:35 christos Exp $        */
+/*     $NetBSD: dtrace_ioctl.c,v 1.5 2015/06/19 02:33:00 riastradh Exp $       */
 
 /*
  * CDDL HEADER START
@@ -659,10 +659,15 @@
                mutex_exit(&dtrace_provider_lock);
 
                if (pvp == NULL && error == 0) {
-                       error = module_autoload(pvd->dtvd_name,
-                           MODULE_CLASS_MISC);
-                       if (error == 0)
-                               goto again;
+                       char name[NAME_MAX];
+
+                       if (snprintf(name, sizeof name, "dtrace_%s",
+                           pvd->dtvd_name) < sizeof name) {
+                               error = module_autoload(name,
+                                   MODULE_CLASS_MISC);
+                               if (error == 0)
+                                       goto again;
+                       }
                }
 
                if (pvp == NULL)



Home | Main Index | Thread Index | Old Index