Module Name: src
Committed By: pgoyette
Date: Sun Jul 25 13:49:58 UTC 2010
Modified Files:
src/sys/dev/scsipi: scsipi_verbose.c scsipiconf.c
Log Message:
Move setting of scsi_verbose_loaded flag into the module's init routine.
This ensures that the flag is set even if the module was manually loaded
by the user rather than just auto-loaded.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/scsipi/scsipi_verbose.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/scsipi/scsipiconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/scsipi_verbose.c
diff -u src/sys/dev/scsipi/scsipi_verbose.c:1.31 src/sys/dev/scsipi/scsipi_verbose.c:1.32
--- src/sys/dev/scsipi/scsipi_verbose.c:1.31 Mon Jun 7 01:41:39 2010
+++ src/sys/dev/scsipi/scsipi_verbose.c Sun Jul 25 13:49:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_verbose.c,v 1.31 2010/06/07 01:41:39 pgoyette Exp $ */
+/* $NetBSD: scsipi_verbose.c,v 1.32 2010/07/25 13:49:58 pgoyette Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.31 2010/06/07 01:41:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.32 2010/07/25 13:49:58 pgoyette Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -615,6 +615,7 @@
saved_print_sense_data = scsipi_print_sense_data;
scsipi_print_sense = scsipi_print_sense_real;
scsipi_print_sense_data = scsipi_print_sense_data_real;
+ scsi_verbose_loaded = 1;
return 0;
case MODULE_CMD_FINI:
scsipi_print_sense = saved_print_sense;
Index: src/sys/dev/scsipi/scsipiconf.c
diff -u src/sys/dev/scsipi/scsipiconf.c:1.38 src/sys/dev/scsipi/scsipiconf.c:1.39
--- src/sys/dev/scsipi/scsipiconf.c:1.38 Mon Jun 7 01:41:39 2010
+++ src/sys/dev/scsipi/scsipiconf.c Sun Jul 25 13:49:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.c,v 1.38 2010/06/07 01:41:39 pgoyette Exp $ */
+/* $NetBSD: scsipiconf.c,v 1.39 2010/07/25 13:49:58 pgoyette 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.38 2010/06/07 01:41:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.39 2010/07/25 13:49:58 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,13 +107,11 @@
void
scsipi_load_verbose(void)
{
- if (scsi_verbose_loaded)
- return;
-
- mutex_enter(&module_lock);
- if (module_autoload("scsiverbose", MODULE_CLASS_MISC) == 0)
- scsi_verbose_loaded++;
- mutex_exit(&module_lock);
+ if (scsi_verbose_loaded == 0) {
+ mutex_enter(&module_lock);
+ module_autoload("scsiverbose", MODULE_CLASS_MISC);
+ mutex_exit(&module_lock);
+ }
}
/*
