From owner-svn-src-projects@FreeBSD.ORG Fri Dec 24 15:36:13 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28676106564A; Fri, 24 Dec 2010 15:36:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0C5C08FC17; Fri, 24 Dec 2010 15:36:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBOFaCDn094495; Fri, 24 Dec 2010 15:36:12 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBOFaCEZ094493; Fri, 24 Dec 2010 15:36:12 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201012241536.oBOFaCEZ094493@svn.freebsd.org> From: Alexander Motin Date: Fri, 24 Dec 2010 15:36:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216690 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Dec 2010 15:36:13 -0000 Author: mav Date: Fri Dec 24 15:36:12 2010 New Revision: 216690 URL: http://svn.freebsd.org/changeset/base/216690 Log: Hold root mounting while metadata module waits for disks. Modified: projects/graid/head/sys/geom/raid/md_intel.c Modified: projects/graid/head/sys/geom/raid/md_intel.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_intel.c Fri Dec 24 11:08:30 2010 (r216689) +++ projects/graid/head/sys/geom/raid/md_intel.c Fri Dec 24 15:36:12 2010 (r216690) @@ -157,6 +157,7 @@ struct g_raid_md_intel_object { struct callout mdio_start_co; /* STARTING state timer. */ int mdio_disks_present; int mdio_started; + struct root_hold_token *mdio_rootmount; /* Root mount delay token. */ }; static g_raid_md_create_t g_raid_md_create_intel; @@ -486,6 +487,7 @@ g_raid_md_intel_start(struct g_raid_soft md = sc->sc_md; mdi = (struct g_raid_md_intel_object *)md; meta = mdi->mdio_meta; + /* Create volumes */ for (i = 0; i < meta->total_volumes; i++) { mvol = intel_get_volume(meta, i); @@ -510,9 +512,14 @@ g_raid_md_intel_start(struct g_raid_soft vol->v_sectorsize = 512; //ZZZ g_raid_start_volume(vol); } - LIST_FOREACH(disk, &sc->sc_disks, d_next) { + LIST_FOREACH(disk, &sc->sc_disks, d_next) g_raid_md_intel_start_disk(disk); - } + + mdi->mdio_started = 1; + callout_stop(&mdi->mdio_start_co); + G_RAID_DEBUG(1, "root_mount_rel %p", mdi->mdio_rootmount); + root_mount_rel(mdi->mdio_rootmount); + mdi->mdio_rootmount = NULL; } static void @@ -553,11 +560,8 @@ g_raid_md_intel_new_disk(struct g_raid_d if (mdi->mdio_started) { g_raid_md_intel_start_disk(disk); } else { - if (mdi->mdio_disks_present == meta->total_disks) { - mdi->mdio_started = 1; - callout_stop(&mdi->mdio_start_co); + if (mdi->mdio_disks_present == meta->total_disks) g_raid_md_intel_start(sc); - } } } @@ -574,7 +578,6 @@ g_raid_intel_go(void *arg) sx_xlock(&sc->sc_lock); if (!mdi->mdio_started) { G_RAID_DEBUG(0, "Force node %s start due to timeout.", sc->sc_name); - mdi->mdio_started = 1; g_raid_md_intel_start(sc); } sx_xunlock(&sc->sc_lock); @@ -695,6 +698,8 @@ g_raid_md_taste_intel(struct g_raid_md_o callout_init(&mdi->mdio_start_co, 1); callout_reset(&mdi->mdio_start_co, g_raid_start_timeout * hz, g_raid_intel_go, sc); + mdi->mdio_rootmount = root_mount_hold("GRAID-Intel"); + G_RAID_DEBUG(1, "root_mount_hold %p", mdi->mdio_rootmount); } rcp = g_new_consumer(geom); @@ -920,7 +925,6 @@ g_raid_md_ctl_intel(struct g_raid_md_obj pd->pd_meta = intel_meta_copy(meta); intel_meta_write(disk->d_consumer, meta); } - mdi->mdio_started = 1; g_raid_md_intel_start(sc); return (0); } @@ -960,6 +964,9 @@ g_raid_md_free_intel(struct g_raid_md_ob if (!mdi->mdio_started) { mdi->mdio_started = 0; callout_stop(&mdi->mdio_start_co); + G_RAID_DEBUG(1, "root_mount_rel %p", mdi->mdio_rootmount); + root_mount_rel(mdi->mdio_rootmount); + mdi->mdio_rootmount = NULL; } if (mdi->mdio_meta != NULL) { free(mdi->mdio_meta, M_MD_INTEL);