[src/trunk]: src/sys/arch Complete the dosparts -> mbrparts conversion. Only ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/47b2d85c38a7
branches:  trunk
changeset: 786864:47b2d85c38a7
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 16 19:06:43 2013 +0000

description:
Complete the dosparts -> mbrparts conversion. Only x86k new uses dosparts
because it also uses struct dos_partition.

diffstat:

 sys/arch/arc/arc/disksubr.c         |  8 ++++----
 sys/arch/arc/include/disklabel.h    |  4 ++--
 sys/arch/bebox/include/disklabel.h  |  4 ++--
 sys/arch/cobalt/cobalt/disksubr.c   |  8 ++++----
 sys/arch/cobalt/include/disklabel.h |  4 ++--
 sys/arch/emips/include/disklabel.h  |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diffs (144 lines):

diff -r 7f06b1ff7150 -r 47b2d85c38a7 sys/arch/arc/arc/disksubr.c
--- a/sys/arch/arc/arc/disksubr.c       Thu May 16 18:47:38 2013 +0000
+++ b/sys/arch/arc/arc/disksubr.c       Thu May 16 19:06:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.28 2008/01/02 11:48:22 ad Exp $ */
+/*     $NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:44 christos Exp $   */
 /*     $OpenBSD: disksubr.c,v 1.14 1997/05/08 00:14:29 deraadt Exp $   */
 /*     NetBSD: disksubr.c,v 1.40 1999/05/06 15:45:51 christos Exp      */
 
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2008/01/02 11:48:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:44 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -188,7 +188,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* XXX - OpenBSD supports disklabel in EXT partition, but we don't */
        /* read master boot record */
@@ -431,7 +431,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
diff -r 7f06b1ff7150 -r 47b2d85c38a7 sys/arch/arc/include/disklabel.h
--- a/sys/arch/arc/include/disklabel.h  Thu May 16 18:47:38 2013 +0000
+++ b/sys/arch/arc/include/disklabel.h  Thu May 16 19:06:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.11 2011/08/30 12:39:53 bouyer Exp $    */
+/*     $NetBSD: disklabel.h,v 1.12 2013/05/16 19:06:44 christos Exp $  */
 /*     $OpenBSD: disklabel.h,v 1.14 1999/03/23 16:36:17 millert Exp $  */
 /*     NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp       */
 
@@ -56,7 +56,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 7f06b1ff7150 -r 47b2d85c38a7 sys/arch/bebox/include/disklabel.h
--- a/sys/arch/bebox/include/disklabel.h        Thu May 16 18:47:38 2013 +0000
+++ b/sys/arch/bebox/include/disklabel.h        Thu May 16 19:06:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.10 2011/08/30 12:39:53 bouyer Exp $    */
+/*     $NetBSD: disklabel.h,v 1.11 2013/05/16 19:06:44 christos Exp $  */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -52,7 +52,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 7f06b1ff7150 -r 47b2d85c38a7 sys/arch/cobalt/cobalt/disksubr.c
--- a/sys/arch/cobalt/cobalt/disksubr.c Thu May 16 18:47:38 2013 +0000
+++ b/sys/arch/cobalt/cobalt/disksubr.c Thu May 16 19:06:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.24 2008/03/03 15:22:01 tsutsui Exp $    */
+/*     $NetBSD: disksubr.c,v 1.25 2013/05/16 19:06:44 christos Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.24 2008/03/03 15:22:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.25 2013/05/16 19:06:44 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,7 +137,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
@@ -333,7 +333,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
diff -r 7f06b1ff7150 -r 47b2d85c38a7 sys/arch/cobalt/include/disklabel.h
--- a/sys/arch/cobalt/include/disklabel.h       Thu May 16 18:47:38 2013 +0000
+++ b/sys/arch/cobalt/include/disklabel.h       Thu May 16 19:06:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.11 2011/08/30 12:39:54 bouyer Exp $    */
+/*     $NetBSD: disklabel.h,v 1.12 2013/05/16 19:06:44 christos Exp $  */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -53,7 +53,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 7f06b1ff7150 -r 47b2d85c38a7 sys/arch/emips/include/disklabel.h
--- a/sys/arch/emips/include/disklabel.h        Thu May 16 18:47:38 2013 +0000
+++ b/sys/arch/emips/include/disklabel.h        Thu May 16 19:06:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.2 2011/08/30 12:39:54 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.5 2013/05/16 19:06:44 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -50,7 +50,7 @@
 #endif /* HAVE_NBTOOL_CONFIG_H */
 
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };