diff options
| author | phk <phk@FreeBSD.org> | 2003-11-18 18:19:26 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-11-18 18:19:26 +0000 |
| commit | 89aeb7d1dffe850accd2b5aab6307acc5b86ee1b (patch) | |
| tree | 4404bd0ac0cb2d8b130ab073f875b091512f731e /sys/dev/md | |
| parent | d7fc6b258d3126c6aeb71b6a57bb1e3dc66ddcf7 (diff) | |
| download | FreeBSD-src-89aeb7d1dffe850accd2b5aab6307acc5b86ee1b.zip FreeBSD-src-89aeb7d1dffe850accd2b5aab6307acc5b86ee1b.tar.gz | |
Use the class->init() to hitch up preload devices, rather than rely on
the "old" SYSINIT. This makes sure things happen in the right order.
XXX: md(4) needs to be fully geom-ified and in particluar /dev/md.ctl
should be abandonded for the GEOM OaM api.
Approved by: re@
Diffstat (limited to 'sys/dev/md')
| -rw-r--r-- | sys/dev/md/md.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index c630a96..605b7cf 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -107,6 +107,8 @@ static u_char mfs_root[MD_ROOT_SIZE*1024] = "MFS Filesystem goes here"; static u_char end_mfs_root[] __unused = "MFS Filesystem had better STOP here"; #endif +static g_init_t md_drvinit; + static int mdrootready; static int mdunits; static dev_t status_dev = 0; @@ -339,6 +341,7 @@ s_write(struct indir *ip, off_t offset, uintptr_t ptr) struct g_class g_md_class = { .name = "MD", + .init = md_drvinit, }; static int @@ -1160,7 +1163,7 @@ md_preloaded(u_char *image, unsigned length) } static void -md_drvinit(void *unused) +md_drvinit(struct g_class *mp __unused) { caddr_t mod; @@ -1172,6 +1175,7 @@ md_drvinit(void *unused) md_preloaded(mfs_root, MD_ROOT_SIZE*1024); #endif mod = NULL; + g_topology_unlock(); while ((mod = preload_search_next_name(mod)) != NULL) { name = (char *)preload_search_info(mod, MODINFO_NAME); type = (char *)preload_search_info(mod, MODINFO_TYPE); @@ -1191,6 +1195,7 @@ md_drvinit(void *unused) } status_dev = make_dev(&mdctl_cdevsw, 0xffff00ff, UID_ROOT, GID_WHEEL, 0600, MDCTL_NAME); + g_topology_lock(); } static int @@ -1201,7 +1206,6 @@ md_modevent(module_t mod, int type, void *data) switch (type) { case MOD_LOAD: - md_drvinit(NULL); break; case MOD_UNLOAD: LIST_FOREACH(sc, &md_softc_list, list) { |
