From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 26 20:34:16 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 A6680106566B;
	Wed, 26 Jan 2011 20:34:16 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 965E68FC16;
	Wed, 26 Jan 2011 20:34:16 +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 p0QKYGti089321;
	Wed, 26 Jan 2011 20:34:16 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0QKYGkB089319;
	Wed, 26 Jan 2011 20:34:16 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201101262034.p0QKYGkB089319@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 26 Jan 2011 20:34:16 +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: r217907 - 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: Wed, 26 Jan 2011 20:34:16 -0000

Author: imp
Date: Wed Jan 26 20:34:16 2011
New Revision: 217907
URL: http://svn.freebsd.org/changeset/base/217907

Log:
  Set arg before timeout function pointer to avoid a 1 instruction race.

Modified:
  projects/graid/head/sys/geom/raid/tr_raid1.c

Modified: projects/graid/head/sys/geom/raid/tr_raid1.c
==============================================================================
--- projects/graid/head/sys/geom/raid/tr_raid1.c	Wed Jan 26 20:29:28 2011	(r217906)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Wed Jan 26 20:34:16 2011	(r217907)
@@ -259,8 +259,8 @@ g_raid_tr_update_state_raid1(struct g_ra
 		    G_RAID_EVENT_VOLUME);
 		if (s == G_RAID_VOLUME_S_DEGRADED) {
 			g_raid_tr_raid1_rebuild_start(vol->v_tr, vol);
-			vol->v_timeout = g_raid_tr_raid1_idle_rebuild;
 			vol->v_to_arg = trs;
+			vol->v_timeout = g_raid_tr_raid1_idle_rebuild;
 		} else {
 			vol->v_timeout = 0;
 			vol->v_to_arg = 0;