diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-04-27 22:20:02 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-04-27 22:20:02 +0000 |
| commit | 2003a7dedc7d0d8ad0d735b5ed8a37beea46752a (patch) | |
| tree | 7e01385bded98173897c1905c11f1dad034ddff9 /sys | |
| parent | 548497f91bdfef9ed0252a76deda907bda232a77 (diff) | |
Even floppies should use DISKLABELDEV() on the dev_t parameter to
readdisklabel/writedisklabel.
ok deraadt@ weingart@ conceptual ok drahn@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/dev/fd.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/fd.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 7 |
3 files changed, 10 insertions, 9 deletions
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);*/ } diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 00be031c20e..20fe855ef50 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.60 2007/02/15 00:53:26 krw Exp $ */ +/* $OpenBSD: fd.c,v 1.61 2007/04/27 22:20:01 krw Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -995,7 +995,8 @@ fdioctl(dev, cmd, addr, flag, p) lp->d_magic2 = DISKMAGIC; lp->d_checksum = dkcksum(lp); - errstring = readdisklabel(dev, fdstrategy, lp, &cdl, 0); + errstring = readdisklabel(DISKLABELDEV(dev), fdstrategy, lp, + &cdl, 0); if (errstring) { /*printf("%s: %s\n", fd->sc_dev.dv_xname, errstring);*/ } @@ -1017,7 +1018,7 @@ fdioctl(dev, cmd, addr, flag, p) if (error) return error; - error = writedisklabel(dev, fdstrategy, lp, NULL); + error = writedisklabel(DISKLABELDEV(dev), fdstrategy, lp, NULL); return error; case FD_FORM: |