summaryrefslogtreecommitdiffstats
path: root/tools/regression/geom
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-06-09 10:59:04 +0000
committerphk <phk@FreeBSD.org>2002-06-09 10:59:04 +0000
commit38cd21ba9c3a5db9e9163e7eaaa1e72f96fee5fe (patch)
treef0db07f1d99582b3018cfca3130fb758ce375f3a /tools/regression/geom
parent411db1de5af2d592dad99b0be550c1d1396cb0bd (diff)
downloadFreeBSD-src-38cd21ba9c3a5db9e9163e7eaaa1e72f96fee5fe.zip
FreeBSD-src-38cd21ba9c3a5db9e9163e7eaaa1e72f96fee5fe.tar.gz
Catch up with kernel.
Diffstat (limited to 'tools/regression/geom')
-rw-r--r--tools/regression/geom/Test/T001/ref.conf2
-rw-r--r--tools/regression/geom/Test/T002/ref.conf2
-rw-r--r--tools/regression/geom/Test/T003/ref.conf2
-rw-r--r--tools/regression/geom/Test/T004/ref.conf2
-rw-r--r--tools/regression/geom/geom_simdev.c4
-rw-r--r--tools/regression/geom/geom_simdisk.c12
6 files changed, 12 insertions, 12 deletions
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index 264304d..065ac7d 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -155,7 +155,7 @@
<flags>0</flags>
</magicspace>
<magicspace>
- <name>signatur</name>
+ <name>magic</name>
<offset>510</offset>
<length>2</length>
<flags>0</flags>
diff --git a/tools/regression/geom/Test/T002/ref.conf b/tools/regression/geom/Test/T002/ref.conf
index 849ca57..7071b89 100644
--- a/tools/regression/geom/Test/T002/ref.conf
+++ b/tools/regression/geom/Test/T002/ref.conf
@@ -55,7 +55,7 @@
<flags>0</flags>
</magicspace>
<magicspace>
- <name>signatur</name>
+ <name>magic</name>
<offset>510</offset>
<length>2</length>
<flags>0</flags>
diff --git a/tools/regression/geom/Test/T003/ref.conf b/tools/regression/geom/Test/T003/ref.conf
index 9114a6e..069e8c1 100644
--- a/tools/regression/geom/Test/T003/ref.conf
+++ b/tools/regression/geom/Test/T003/ref.conf
@@ -599,7 +599,7 @@
<flags>0</flags>
</magicspace>
<magicspace>
- <name>signatur</name>
+ <name>magic</name>
<offset>510</offset>
<length>2</length>
<flags>0</flags>
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index 7e23838..1e48f9e 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -125,7 +125,7 @@
<flags>0</flags>
</magicspace>
<magicspace>
- <name>signatur</name>
+ <name>magic</name>
<offset>510</offset>
<length>2</length>
<flags>0</flags>
diff --git a/tools/regression/geom/geom_simdev.c b/tools/regression/geom/geom_simdev.c
index 8dd3da4..2b51806 100644
--- a/tools/regression/geom/geom_simdev.c
+++ b/tools/regression/geom/geom_simdev.c
@@ -83,7 +83,7 @@ g_dev_orphan(struct g_consumer *cp)
return;
if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0)
g_access_rel(cp, -cp->acr, -cp->acw, -cp->ace);
- g_dettach(cp);
+ g_detach(cp);
g_destroy_consumer(cp);
g_destroy_geom(gp);
}
@@ -93,7 +93,7 @@ static struct g_class dev_class = {
"DEV-class",
dev_taste,
NULL,
- G_CLASS_INITSTUFF
+ G_CLASS_INITIALIZER
};
static struct g_geom *
diff --git a/tools/regression/geom/geom_simdisk.c b/tools/regression/geom/geom_simdisk.c
index 489e253..db79150 100644
--- a/tools/regression/geom/geom_simdisk.c
+++ b/tools/regression/geom/geom_simdisk.c
@@ -52,7 +52,7 @@ struct g_class g_simdisk_class = {
"SIMDISK-class",
NULL,
NULL,
- G_CLASS_INITSTUFF
+ G_CLASS_INITIALIZER
};
static void
@@ -106,15 +106,15 @@ g_simdisk_start(struct bio *bp)
return;
}
if (bp->bio_cmd == BIO_GETATTR) {
- if (g_haveattr_int(bp, "GEOM::sectorsize", sc->sectorsize))
+ if (g_handleattr_int(bp, "GEOM::sectorsize", sc->sectorsize))
return;
- if (g_haveattr_int(bp, "GEOM::fwsectors", sc->fwsectors))
+ if (g_handleattr_int(bp, "GEOM::fwsectors", sc->fwsectors))
return;
- if (g_haveattr_int(bp, "GEOM::fwheads", sc->fwheads))
+ if (g_handleattr_int(bp, "GEOM::fwheads", sc->fwheads))
return;
- if (g_haveattr_int(bp, "GEOM::fwcylinders", sc->fwcylinders))
+ if (g_handleattr_int(bp, "GEOM::fwcylinders", sc->fwcylinders))
return;
- if (g_haveattr_off_t(bp, "GEOM::mediasize", sc->mediasize))
+ if (g_handleattr_off_t(bp, "GEOM::mediasize", sc->mediasize))
return;
}
bp->bio_error = EOPNOTSUPP;
OpenPOWER on IntegriCloud