Catch up with kernel.
This commit is contained in:
parent
503abe4540
commit
7aca952dca
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=98067
@ -155,7 +155,7 @@
|
||||
<flags>0</flags>
|
||||
</magicspace>
|
||||
<magicspace>
|
||||
<name>signatur</name>
|
||||
<name>magic</name>
|
||||
<offset>510</offset>
|
||||
<length>2</length>
|
||||
<flags>0</flags>
|
||||
|
@ -55,7 +55,7 @@
|
||||
<flags>0</flags>
|
||||
</magicspace>
|
||||
<magicspace>
|
||||
<name>signatur</name>
|
||||
<name>magic</name>
|
||||
<offset>510</offset>
|
||||
<length>2</length>
|
||||
<flags>0</flags>
|
||||
|
@ -599,7 +599,7 @@
|
||||
<flags>0</flags>
|
||||
</magicspace>
|
||||
<magicspace>
|
||||
<name>signatur</name>
|
||||
<name>magic</name>
|
||||
<offset>510</offset>
|
||||
<length>2</length>
|
||||
<flags>0</flags>
|
||||
|
@ -125,7 +125,7 @@
|
||||
<flags>0</flags>
|
||||
</magicspace>
|
||||
<magicspace>
|
||||
<name>signatur</name>
|
||||
<name>magic</name>
|
||||
<offset>510</offset>
|
||||
<length>2</length>
|
||||
<flags>0</flags>
|
||||
|
@ -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 *
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user