Module Name: src
Committed By: mlelstv
Date: Sun Aug 2 07:25:40 UTC 2015
Modified Files:
src/sys/dev: dksubr.c
Log Message:
fix diskerr message, it needs the driver name, not the device unit name.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.67 src/sys/dev/dksubr.c:1.68
--- src/sys/dev/dksubr.c:1.67 Wed Jul 22 10:32:16 2015
+++ src/sys/dev/dksubr.c Sun Aug 2 07:25:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.67 2015/07/22 10:32:16 skrll Exp $ */
+/* $NetBSD: dksubr.c,v 1.68 2015/08/02 07:25:40 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.67 2015/07/22 10:32:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.68 2015/08/02 07:25:40 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -289,7 +289,9 @@ dk_done(struct dk_softc *dksc, struct bu
struct disk *dk = &dksc->sc_dkdev;
if (bp->b_error != 0) {
- diskerr(bp, dksc->sc_xname, "error", LOG_PRINTF, 0,
+ struct cfdriver *cd = device_cfdriver(dksc->sc_dev);
+
+ diskerr(bp, cd->cd_name, "error", LOG_PRINTF, 0,
dk->dk_label);
printf("\n");
}
