From owner-svn-src-projects@FreeBSD.ORG Mon Mar 14 19:31:43 2011 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 B38AB1065672; Mon, 14 Mar 2011 19:31:43 +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 A04F38FC0C; Mon, 14 Mar 2011 19:31:43 +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 p2EJVh2s003906; Mon, 14 Mar 2011 19:31:43 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2EJVh3N003904; Mon, 14 Mar 2011 19:31:43 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201103141931.p2EJVh3N003904@svn.freebsd.org> From: Alexander Motin Date: Mon, 14 Mar 2011 19:31:43 +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: r219645 - 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: Mon, 14 Mar 2011 19:31:43 -0000 Author: mav Date: Mon Mar 14 19:31:43 2011 New Revision: 219645 URL: http://svn.freebsd.org/changeset/base/219645 Log: Don't forget to read subdisks position/sizes from metadata. Modified: projects/graid/head/sys/geom/raid/md_promise.c Modified: projects/graid/head/sys/geom/raid/md_promise.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_promise.c Mon Mar 14 19:04:44 2011 (r219644) +++ projects/graid/head/sys/geom/raid/md_promise.c Mon Mar 14 19:31:43 2011 (r219645) @@ -590,6 +590,10 @@ nofit: g_raid_change_disk_state(disk, G_RAID_DISK_S_SPARE); */ else g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); + + sd->sd_offset = pd->pd_meta[sdn]->disk_offset * 512; + sd->sd_size = pd->pd_meta[sdn]->disk_sectors * 512; + /* Up to date disk. */ g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_ACTIVE); @@ -782,6 +786,7 @@ static void g_raid_md_promise_start(struct g_raid_volume *vol) { struct g_raid_softc *sc; + struct g_raid_subdisk *sd; struct g_raid_disk *disk; struct g_raid_md_object *md; struct g_raid_md_promise_object *mdi; @@ -818,6 +823,11 @@ g_raid_md_promise_start(struct g_raid_vo vol->v_disks_count = meta->total_disks; vol->v_mediasize = (off_t)meta->total_sectors * 512; //ZZZ vol->v_sectorsize = 512; //ZZZ + for (i = 0; i < vol->v_disks_count; i++) { + sd = &vol->v_subdisks[i]; + sd->sd_offset = (off_t)meta->disk_offset * 512; //ZZZ + sd->sd_size = (off_t)meta->disk_sectors * 512; //ZZZ + } g_raid_start_volume(vol); /* Make all disks found till the moment take their places. */