Module Name: src
Committed By: pgoyette
Date: Sat Mar 25 07:00:33 UTC 2017
Modified Files:
src/sys/dev: vnd.c
Log Message:
Don't display step-by-step detailed error messages unless DIAGNOSTIC.
Among other things, this avoids expected "error messages" when the
module is being auto-unloaded while one or more units are still in
use.
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.258 src/sys/dev/vnd.c:1.259
--- src/sys/dev/vnd.c:1.258 Fri Aug 5 08:21:24 2016
+++ src/sys/dev/vnd.c Sat Mar 25 07:00:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.258 2016/08/05 08:21:24 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.259 2017/03/25 07:00:33 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.258 2016/08/05 08:21:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.259 2017/03/25 07:00:33 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -2071,8 +2071,10 @@ vnd_modcmd(modcmd_t cmd, void *arg)
error = config_cfattach_attach(vnd_cd.cd_name, &vnd_ca);
if (error) {
config_cfdriver_detach(&vnd_cd);
+#ifdef DIAGNOSTIC
aprint_error("%s: unable to register cfattach for \n"
"%s, error %d", __func__, vnd_cd.cd_name, error);
+#endif
break;
}
@@ -2087,8 +2089,10 @@ vnd_modcmd(modcmd_t cmd, void *arg)
if (error) {
config_cfattach_detach(vnd_cd.cd_name, &vnd_ca);
config_cfdriver_detach(&vnd_cd);
+#ifdef DIAGNOSTIC
aprint_error("%s: unable to attach %s devsw, "
"error %d", __func__, vnd_cd.cd_name, error);
+#endif
break;
}
#endif
@@ -2108,8 +2112,10 @@ vnd_modcmd(modcmd_t cmd, void *arg)
if (error) {
(void)devsw_attach("vnd", &vnd_bdevsw, &vnd_bmajor,
&vnd_cdevsw, &vnd_cmajor);
+#ifdef DIAGNOSTIC
aprint_error("%s: failed to detach %s cfattach, "
"error %d\n", __func__, vnd_cd.cd_name, error);
+#endif
break;
}
error = config_cfdriver_detach(&vnd_cd);
@@ -2117,9 +2123,11 @@ vnd_modcmd(modcmd_t cmd, void *arg)
(void)config_cfattach_attach(vnd_cd.cd_name, &vnd_ca);
(void)devsw_attach("vnd", &vnd_bdevsw, &vnd_bmajor,
&vnd_cdevsw, &vnd_cmajor);
+#ifdef DIAGNOSTIC
aprint_error("%s: failed to detach %s cfdriver, "
"error %d\n", __func__, vnd_cd.cd_name, error);
break;
+#endif
}
#endif
break;
