From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  7 16:33:00 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 E7FB8106564A;
	Mon,  7 Feb 2011 16:33:00 +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 D85C68FC23;
	Mon,  7 Feb 2011 16:33:00 +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 p17GX0od015367;
	Mon, 7 Feb 2011 16:33:00 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17GX0OT015365;
	Mon, 7 Feb 2011 16:33:00 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102071633.p17GX0OT015365@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 7 Feb 2011 16:33:00 +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: r218407 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Feb 2011 16:33:01 -0000

Author: mav
Date: Mon Feb  7 16:33:00 2011
New Revision: 218407
URL: http://svn.freebsd.org/changeset/base/218407

Log:
  After unclean shutdown we have to restart rebuild and resync processes
  from the beginning. We can't trust completed portions synchronicity.

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	Mon Feb  7 16:14:12 2011	(r218406)
+++ projects/graid/head/sys/geom/raid/md_intel.c	Mon Feb  7 16:33:00 2011	(r218407)
@@ -737,10 +737,14 @@ nofit:
 				/* Rebuilding disk. */
 				g_raid_change_subdisk_state(sd,
 				    G_RAID_SUBDISK_S_REBUILD);
-				sd->sd_rebuild_pos =
-				    (off_t)mvol->curr_migr_unit *
-				    sd->sd_volume->v_strip_size *
-				    mmap0->total_domains;
+				if (mvol->dirty) {
+					sd->sd_rebuild_pos = 0;
+				} else {
+					sd->sd_rebuild_pos =
+					    (off_t)mvol->curr_migr_unit *
+					    sd->sd_volume->v_strip_size *
+					    mmap0->total_domains;
+				}
 			}
 		} else if (mvol->migr_type == INTEL_MT_VERIFY ||
 			   mvol->migr_type == INTEL_MT_REPAIR) {
@@ -756,10 +760,14 @@ nofit:
 				/* Resyncing disk. */
 				g_raid_change_subdisk_state(sd,
 				    G_RAID_SUBDISK_S_RESYNC);
-				sd->sd_rebuild_pos =
-				    (off_t)mvol->curr_migr_unit *
-				    sd->sd_volume->v_strip_size *
-				    mmap0->total_domains;
+				if (mvol->dirty) {
+					sd->sd_rebuild_pos = 0;
+				} else {
+					sd->sd_rebuild_pos =
+					    (off_t)mvol->curr_migr_unit *
+					    sd->sd_volume->v_strip_size *
+					    mmap0->total_domains;
+				}
 			}
 		}
 		g_raid_event_send(sd, G_RAID_SUBDISK_E_NEW,