[src/trunk]: src/sys/dev/scsipi just do not autoload scsiverbose module, it c...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/563dd1d028e9
branches:  trunk
changeset: 352617:563dd1d028e9
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Apr 10 21:53:37 2017 +0000

description:
just do not autoload scsiverbose module, it causes deadlock if it happens
while root fs is being mounted

adresses second part of PR kern/52147 by Michael van Elst, thank you

diffstat:

 sys/dev/scsipi/scsipiconf.c |  16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diffs (51 lines):

diff -r 4934e402ee23 -r 563dd1d028e9 sys/dev/scsipi/scsipiconf.c
--- a/sys/dev/scsipi/scsipiconf.c       Mon Apr 10 21:36:05 2017 +0000
+++ b/sys/dev/scsipi/scsipiconf.c       Mon Apr 10 21:53:37 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipiconf.c,v 1.42 2016/11/20 15:37:19 mlelstv Exp $  */
+/*     $NetBSD: scsipiconf.c,v 1.43 2017/04/10 21:53:37 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.42 2016/11/20 15:37:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.43 2017/04/10 21:53:37 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,6 @@
 int
 scsipi_print_sense_stub(struct scsipi_xfer * xs, int verbosity)
 {
-       scsipi_load_verbose();
        if (scsi_verbose_loaded)
                return scsipi_print_sense(xs, verbosity);
        else
@@ -82,7 +81,6 @@
 void
 scsipi_print_sense_data_stub(struct scsi_sense_data *sense, int verbosity)
 {
-       scsipi_load_verbose();
        if (scsi_verbose_loaded)
                scsipi_print_sense_data(sense, verbosity);
 }
@@ -110,16 +108,6 @@
        return rc;
 }
 
-/* 
- * Load the scsiverbose module
- */   
-void
-scsipi_load_verbose(void)
-{
-       if (scsi_verbose_loaded == 0)
-               module_autoload("scsiverbose", MODULE_CLASS_MISC);
-}
-
 /*
  * allocate and init a scsipi_periph structure for a new device.
  */