do not depend on previous loop variable, use a constant instead

19 files changed, 76 insertions, 76 deletions

diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index b7447c24f93..c82b5b5302a 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.84 2007/06/12 20:57:41 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.85 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -137,9 +137,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	minilabel = fallbacklabel = *lp;
 
 	/* get a buffer and initialize it */
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index d9f3f22fa51..eed94b62ddb 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.46 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.47 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -96,9 +96,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* Look for any BIOS geometry information we should honour. */
 	devno = chrtoblk(dev);
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 885d68a5818..713594af0ce 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.41 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.42 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -88,9 +88,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* get a buffer and initialize it */
 	bp = geteblk((int)lp->d_secsize);
diff --git a/sys/arch/aviion/aviion/disksubr.c b/sys/arch/aviion/aviion/disksubr.c
index 371ab87a180..992b9ace874 100644
--- a/sys/arch/aviion/aviion/disksubr.c
+++ b/sys/arch/aviion/aviion/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.32 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.33 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -88,9 +88,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* get a buffer and initialize it */
 	bp = geteblk((int)lp->d_secsize);
diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c
index f80945f2746..036046564cc 100644
--- a/sys/arch/hp300/hp300/disksubr.c
+++ b/sys/arch/hp300/hp300/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.37 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.38 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.9 1997/04/01 03:12:13 scottr Exp $	*/
 
 /*
@@ -74,9 +74,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* don't read the on-disk label if we are in spoofed-only mode */
 	if (spoofonly)
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 718c8e85026..81bd44c9c5c 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.62 2007/06/09 23:06:46 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.63 2007/06/14 03:29:34 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -147,9 +147,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	minilabel = fallbacklabel = *lp;
 
 	/* get a buffer and initialize it */
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index 73070bf248c..b5eb6113737 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.45 2007/06/09 23:06:46 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.46 2007/06/14 03:29:34 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -147,9 +147,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	minilabel = fallbacklabel = *lp;
 
 	/* get a buffer and initialize it */
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 75aec04ea0b..d72e7248ea5 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.87 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.88 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -96,9 +96,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* Look for any BIOS geometry information we should honour. */
 	devno = chrtoblk(dev);
diff --git a/sys/arch/landisk/landisk/disksubr.c b/sys/arch/landisk/landisk/disksubr.c
index d8730a8118b..1dcbdcca7ec 100644
--- a/sys/arch/landisk/landisk/disksubr.c
+++ b/sys/arch/landisk/landisk/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.29 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.30 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -88,9 +88,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* get a buffer and initialize it */
 	bp = geteblk((int)lp->d_secsize);
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c
index 41c35069ea1..4a4c529268e 100644
--- a/sys/arch/luna88k/luna88k/disksubr.c
+++ b/sys/arch/luna88k/luna88k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.25 2007/06/12 20:57:42 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.26 2007/06/14 03:29:34 deraadt Exp $ */
 /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */
 
 /*
@@ -135,9 +135,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
         /* don't read the on-disk label if we are in spoofed-only mode */
 	if (spoofonly)
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c
index 0f779bc7bf4..dc3a99bf792 100644
--- a/sys/arch/mac68k/mac68k/disksubr.c
+++ b/sys/arch/mac68k/mac68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.45 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.46 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $	*/
 
 /*
@@ -370,9 +370,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* don't read the on-disk label if we are in spoofed-only mode */
 	if (spoofonly)
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 6e5f35a1313..1dd88522290 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.51 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.52 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -96,9 +96,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* get a buffer and initialize it */
 	bp = geteblk((int)lp->d_secsize);
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 5c26d3ef23f..726e05737d0 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.53 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.54 2007/06/14 03:29:34 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -148,9 +148,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	minilabel = fallbacklabel = *lp;
 
 	/* get a buffer and initialize it */
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c
index 829b68a61aa..169802577f4 100644
--- a/sys/arch/mvme68k/mvme68k/disksubr.c
+++ b/sys/arch/mvme68k/mvme68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.54 2007/06/12 20:57:42 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.55 2007/06/14 03:29:34 deraadt Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -68,9 +68,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* don't read the on-disk label if we are in spoofed-only mode */
 	if (spoofonly)
diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c
index 957220d411e..e08d909b429 100644
--- a/sys/arch/mvme88k/mvme88k/disksubr.c
+++ b/sys/arch/mvme88k/mvme88k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.50 2007/06/12 20:57:43 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.51 2007/06/14 03:29:34 deraadt Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -68,9 +68,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* don't read the on-disk label if we are in spoofed-only mode */
 	if (spoofonly)
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index 747101e9976..b6e8303079e 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.47 2007/06/12 20:57:43 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.48 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -91,9 +91,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 
 	/* get a buffer and initialize it */
 	bp = geteblk((int)lp->d_secsize);
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index c2684037e3f..e9c915ad13f 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.59 2007/06/12 20:57:43 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.60 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
 
 /*
@@ -90,9 +90,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	lp->d_bbsize = 8192;
 	lp->d_sbsize = 64*1024;		/* XXX ? */
 
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c
index 7ab32acc3e0..0b508af27d7 100644
--- a/sys/arch/sparc64/sparc64/disksubr.c
+++ b/sys/arch/sparc64/sparc64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.38 2007/06/12 20:57:43 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.39 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */
 
 /*
@@ -89,9 +89,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	lp->d_bbsize = 8192;
 	lp->d_sbsize = 64*1024;		/* XXX ? */
 
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index f13939627a1..887e11e08b3 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.48 2007/06/12 20:57:43 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.49 2007/06/14 03:29:34 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $	*/
 
 /*
@@ -81,9 +81,9 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		DL_SETPSIZE(&lp->d_partitions[i], 0);
 		DL_SETPOFFSET(&lp->d_partitions[i], 0);
 	}
-	if (DL_GETPSIZE(&lp->d_partitions[i]) == 0)
-		DL_SETPSIZE(&lp->d_partitions[i], DL_GETDSIZE(lp));
-	DL_SETPOFFSET(&lp->d_partitions[i], 0);
+	if (DL_GETPSIZE(&lp->d_partitions[RAW_PART]) == 0)
+		DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp));
+	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	lp->d_bbsize = 8192;
 	lp->d_sbsize = 64 * 1024;