From 2003a7dedc7d0d8ad0d735b5ed8a37beea46752a Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Fri, 27 Apr 2007 22:20:02 +0000
Subject: Even floppies should use DISKLABELDEV() on the dev_t parameter to
 readdisklabel/writedisklabel.

ok deraadt@ weingart@ conceptual ok drahn@
---
 sys/arch/sparc/dev/fd.c   | 6 +++---
 sys/arch/sparc64/dev/fd.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 257d83fe0a2..c8f47e039a4 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.47 2007/02/15 00:53:26 krw Exp $	*/
+/*	$OpenBSD: fd.c,v 1.48 2007/04/27 22:20:01 krw Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -1791,7 +1791,7 @@ fdioctl(dev, cmd, addr, flag, p)
 		if (error)
 			return (error);
 
-		error = writedisklabel(dev, fdstrategy,
+		error = writedisklabel(DISKLABELDEV(dev), fdstrategy,
 				       fd->sc_dk.dk_label,
 				       fd->sc_dk.dk_cpulabel);
 		return (error);
@@ -1983,7 +1983,7 @@ fdgetdisklabel(dev)
 	/*
 	 * Call the generic disklabel extraction routine.
 	 */
-	errstring = readdisklabel(dev, fdstrategy, lp, clp, 0);
+	errstring = readdisklabel(DISKLABELDEV(dev), fdstrategy, lp, clp, 0);
 	if (errstring) {
 		/*printf("%s: %s\n", fd->sc_dv.dv_xname, errstring);*/
 	}
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 2d722fbe8c8..f57073d9238 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.9 2007/02/15 00:53:26 krw Exp $	*/
+/*	$OpenBSD: fd.c,v 1.10 2007/04/27 22:20:01 krw Exp $	*/
 /*	$NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $	*/
 
 /*-
@@ -1855,7 +1855,7 @@ fdioctl(dev, cmd, addr, flag, p)
 		if (error)
 			return (error);
 
-		error = writedisklabel(dev, fdstrategy,
+		error = writedisklabel(DISKLABELDEV(dev), fdstrategy,
 				       fd->sc_dk.dk_label,
 				       fd->sc_dk.dk_cpulabel);
 		return (error);
@@ -2033,7 +2033,7 @@ fdgetdisklabel(dev)
 	 * Call the generic disklabel extraction routine.  If there's
 	 * not a label there, fake it.
 	 */
-	errstring = readdisklabel(dev, fdstrategy, lp, clp, 0);
+	errstring = readdisklabel(DISKLABELDEV(dev), fdstrategy, lp, clp, 0);
 	if (errstring) {
 		/*printf("%s: %s\n", fd->sc_dv.dv_xname, errstring);*/
 	}
-- 
cgit v1.2.3