summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/hp300/dev/hd.c7
-rw-r--r--sys/arch/sparc/dev/fd.c7
-rw-r--r--sys/arch/sparc/dev/presto.c7
-rw-r--r--sys/arch/sparc64/dev/fd.c7
-rw-r--r--sys/dev/ata/wd.c7
-rw-r--r--sys/dev/ccd.c7
-rw-r--r--sys/dev/flash.c8
-rw-r--r--sys/dev/isa/fd.c7
-rw-r--r--sys/dev/isa/mcd.c7
-rw-r--r--sys/dev/ofw/ofdisk.c5
-rw-r--r--sys/dev/ramdisk.c7
-rw-r--r--sys/dev/vnd.c7
-rw-r--r--sys/scsi/cd.c8
-rw-r--r--sys/scsi/sd.c7
14 files changed, 14 insertions, 84 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 24c9ffedf6f..b6b27dac541 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.46 2007/04/30 00:17:48 krw Exp $ */
+/* $OpenBSD: hd.c,v 1.47 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
@@ -518,11 +518,6 @@ hdgetdisklabel(dev, rs, lp, clp, spoofonly)
lp->d_bbsize = BBSIZE;
lp->d_sbsize = SBSIZE;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index c8f47e039a4..d379f2c3c55 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.48 2007/04/27 22:20:01 krw Exp $ */
+/* $OpenBSD: fd.c,v 1.49 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -1971,11 +1971,6 @@ fdgetdisklabel(dev)
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_interleave = 1;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secpercyl * lp->d_ncylinders;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/arch/sparc/dev/presto.c b/sys/arch/sparc/dev/presto.c
index c8afd736c8f..f79450dc536 100644
--- a/sys/arch/sparc/dev/presto.c
+++ b/sys/arch/sparc/dev/presto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: presto.c,v 1.6 2006/09/24 20:29:52 krw Exp $ */
+/* $OpenBSD: presto.c,v 1.7 2007/06/01 00:07:48 krw Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
* All rights reserved.
@@ -388,11 +388,6 @@ presto_getdisklabel(struct presto_softc *sc)
lp->d_rpm = 3600;
lp->d_interleave = 1;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index e2c4413ec1e..313db79d502 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.11 2007/05/28 22:17:21 pyr Exp $ */
+/* $OpenBSD: fd.c,v 1.12 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */
/*-
@@ -2020,11 +2020,6 @@ fdgetdisklabel(dev)
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_interleave = 1;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secpercyl * lp->d_ncylinders;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 2353c8527df..a9c23e1b1ba 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wd.c,v 1.59 2007/05/31 05:24:06 krw Exp $ */
+/* $OpenBSD: wd.c,v 1.60 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
/*
@@ -795,11 +795,6 @@ wdgetdefaultlabel(struct wd_softc *wd, struct disklabel *lp)
lp->d_interleave = 1;
lp->d_flags = 0;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index dc098e2379c..7009bb00642 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccd.c,v 1.72 2007/04/28 12:32:13 krw Exp $ */
+/* $OpenBSD: ccd.c,v 1.73 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */
/*-
@@ -1385,11 +1385,6 @@ ccdgetdisklabel(dev_t dev, struct ccd_softc *cs, struct disklabel *lp,
lp->d_interleave = 1;
lp->d_flags = 0;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(cs->sc_dkdev.dk_label);
diff --git a/sys/dev/flash.c b/sys/dev/flash.c
index ed46c3f6c00..403091b9d48 100644
--- a/sys/dev/flash.c
+++ b/sys/dev/flash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: flash.c,v 1.2 2007/02/15 00:53:26 krw Exp $ */
+/* $OpenBSD: flash.c,v 1.3 2007/06/01 00:07:48 krw Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -1001,12 +1001,6 @@ flashgetdefaultlabel(dev_t dev, struct flash_softc *sc,
lp->d_bbsize = BBSIZE;
lp->d_sbsize = SBSIZE;
- /* Fake the partition information. */
- lp->d_npartitions = RAW_PART + 1;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
-
/* Wrap it up. */
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index c46967b86ad..3d824ea5e26 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.62 2007/05/08 20:59:39 deraadt Exp $ */
+/* $OpenBSD: fd.c,v 1.63 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -986,11 +986,6 @@ fdioctl(dev, cmd, addr, flag, p)
lp->d_rpm = 300;
lp->d_interleave = 1;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 75e25f16dec..ec87e7cfc2e 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcd.c,v 1.43 2007/05/04 22:14:36 deraadt Exp $ */
+/* $OpenBSD: mcd.c,v 1.44 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */
/*
@@ -758,11 +758,6 @@ mcdgetdisklabel(dev, sc, lp, clp, spoofonly)
lp->d_rpm = 300;
lp->d_interleave = 1;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index 8829bdfc7f2..9a8b2fdf58b 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofdisk.c,v 1.13 2007/05/28 15:44:04 miod Exp $ */
+/* $OpenBSD: ofdisk.c,v 1.14 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: ofdisk.c,v 1.3 1996/10/13 01:38:13 christos Exp $ */
/*
@@ -164,9 +164,6 @@ ofdopen(dev_t dev, int flags, int fmt, struct proc *p)
lp->d_ntracks = 1;
lp->d_ncylinders = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
-
readdisklabel(DISKLABELDEV(dev), ofdstrategy, lp,
of->sc_dk.dk_cpulabel, 0);
}
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index 799d4954ccd..6bd7a5da072 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ramdisk.c,v 1.30 2007/04/24 23:14:00 krw Exp $ */
+/* $OpenBSD: ramdisk.c,v 1.31 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $ */
/*
@@ -496,11 +496,6 @@ rdgetdisklabel(dev_t dev, struct rd_softc *sc)
lp->d_rpm = 3600;
lp->d_interleave = 1;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index e74b9a74676..7225fc3db97 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnd.c,v 1.74 2007/05/12 12:19:23 krw Exp $ */
+/* $OpenBSD: vnd.c,v 1.75 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */
/*
@@ -314,11 +314,6 @@ vndgetdisklabel(dev_t dev, struct vnd_softc *sc)
lp->d_interleave = 1;
lp->d_flags = 0;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 43e16e3089a..78efcbf8514 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.125 2007/05/25 05:37:16 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.126 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -1191,12 +1191,6 @@ cdgetdisklabel(dev_t dev, struct cd_softc *cd, struct disklabel *lp,
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
- /* The raw partition is special. */
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
if (cd_load_toc(cd, toc, CD_LBA_FORMAT)) {
audioonly = 0; /* No valid TOC found == not an audio CD. */
goto done;
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index bb3f69875af..b6127a40ba4 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.128 2007/05/31 18:07:18 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.129 2007/06/01 00:07:48 krw Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -1039,11 +1039,6 @@ sdgetdisklabel(dev_t dev, struct sd_softc *sd, struct disklabel *lp,
lp->d_bbsize = BBSIZE;
lp->d_sbsize = SBSIZE;
- lp->d_partitions[RAW_PART].p_offset = 0;
- lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
- lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
- lp->d_npartitions = RAW_PART + 1;
-
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
lp->d_checksum = dkcksum(lp);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 09:57:51 +0000