From ec00834c1808cb4201d91f100fcdd4e3985d49e5 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 12 Mar 1995 08:17:30 +0000
Subject: [PATCH] Finish the previous change.  The device name got lost in
 diskerr().

---
 sys/kern/subr_disklabel.c  | 4 ++--
 sys/ufs/ufs/ufs_disksubr.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index e90fc4339388..f0d659cfd392 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.9 1995/02/16 14:47:38 bde Exp $
+ * $Id: ufs_disksubr.c,v 1.10 1995/02/22 22:46:48 bde Exp $
  */
 
 #include <sys/param.h>
@@ -629,7 +629,7 @@ diskerr(bp, dname, what, pri, blkdone, lp)
 		pr = addlog;
 	} else
 		pr = printf;
-	sname = dsname("", unit, slice, part, partname);
+	sname = dsname(dname, unit, slice, part, partname);
 	(*pr)("%s%s: %s %sing fsbn ", sname, partname, what,
 	      bp->b_flags & B_READ ? "read" : "writ");
 	sn = bp->b_blkno;
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index e90fc4339388..f0d659cfd392 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.9 1995/02/16 14:47:38 bde Exp $
+ * $Id: ufs_disksubr.c,v 1.10 1995/02/22 22:46:48 bde Exp $
  */
 
 #include <sys/param.h>
@@ -629,7 +629,7 @@ diskerr(bp, dname, what, pri, blkdone, lp)
 		pr = addlog;
 	} else
 		pr = printf;
-	sname = dsname("", unit, slice, part, partname);
+	sname = dsname(dname, unit, slice, part, partname);
 	(*pr)("%s%s: %s %sing fsbn ", sname, partname, what,
 	      bp->b_flags & B_READ ? "read" : "writ");
 	sn = bp->b_blkno;