d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the hack which allowed to use gmirror for root file system,

Browse Source 
use root_mount KPI instead.
This commit is contained in:
pjd 2005-04-19 21:47:25 +00:00
parent db9ce4609f
commit 15eddd96be
2 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sys/geom/mirror/g_mirror.c
View File

@ -1890,6 +1890,8 @@ g_mirror_update_device(struct g_mirror_softc *sc, boolean_t force)
* Disks went down in starting phase, so destroy
* device.
*/
root_mount_rel(sc->sc_rootmount);
sc->sc_rootmount = NULL;
callout_drain(&sc->sc_callout);
sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY;
return;
@ -1897,6 +1899,9 @@ g_mirror_update_device(struct g_mirror_softc *sc, boolean_t force)
return;
}
root_mount_rel(sc->sc_rootmount);
sc->sc_rootmount = NULL;
/*
* Activate all disks with the biggest syncid.
*/
@ -2567,6 +2572,7 @@ g_mirror_create(struct g_class *mp, const struct g_mirror_metadata *md)
G_MIRROR_DEBUG(0, "Device %s created (id=%u).", sc->sc_name, sc->sc_id);
sc->sc_rootmount = root_mount_hold("GMIRROR");
/*
* Run timeout.
*/
@ -2858,53 +2864,4 @@ g_mirror_fini(struct g_class *mp)
EVENTHANDLER_DEREGISTER(shutdown_post_sync, g_mirror_ehtag);
}
static int
g_mirror_can_go(void)
{
struct g_mirror_softc *sc;
struct g_geom *gp;
struct g_provider *pp;
int can_go;
DROP_GIANT();
can_go = 1;
g_topology_lock();
LIST_FOREACH(gp, &g_mirror_class.geom, geom) {
sc = gp->softc;
if (sc == NULL) {
can_go = 0;
break;
}
pp = sc->sc_provider;
if (pp == NULL || pp->error != 0) {
can_go = 0;
break;
}
}
g_topology_unlock();
PICKUP_GIANT();
return (can_go);
}
static void
g_mirror_rootwait(void)
{
/*
* HACK: Wait for GEOM, because g_mirror_rootwait() can be called,
* HACK: before we get providers for tasting.
*/
tsleep(&g_mirror_class, PRIBIO, "mroot", hz * 3);
/*
* Wait for mirrors in degraded state.
*/
for (;;) {
if (g_mirror_can_go())
break;
tsleep(&g_mirror_class, PRIBIO, "mroot", hz);
}
}
SYSINIT(g_mirror_root, SI_SUB_RAID, SI_ORDER_FIRST, g_mirror_rootwait, NULL)
DECLARE_GEOM_CLASS(g_mirror_class, g_mirror);

2
sys/geom/mirror/g_mirror.h
View File

@ -191,6 +191,8 @@ struct g_mirror_softc {
struct mtx sc_events_mtx;
struct callout sc_callout;
struct root_hold_token *sc_rootmount;
};
#define sc_name sc_geom->name