From owner-svn-src-projects@FreeBSD.ORG  Thu Mar 31 12:17:37 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 A6796106564A;
	Thu, 31 Mar 2011 12:17:37 +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 96D228FC15;
	Thu, 31 Mar 2011 12:17:37 +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 p2VCHbRk005910;
	Thu, 31 Mar 2011 12:17:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2VCHbQ3005908;
	Thu, 31 Mar 2011 12:17:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201103311217.p2VCHbQ3005908@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 31 Mar 2011 12:17:37 +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: r220191 - 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: Thu, 31 Mar 2011 12:17:37 -0000

Author: mav
Date: Thu Mar 31 12:17:37 2011
New Revision: 220191
URL: http://svn.freebsd.org/changeset/base/220191

Log:
  Fix unreachable code. It could cause not replacing more then one failed disk
  at a time on volumes with Promise metadata.
  
  Found with:	Coverity Prevent(tm)
  CID:		9656

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	Thu Mar 31 12:03:30 2011	(r220190)
+++ projects/graid/head/sys/geom/raid/md_promise.c	Thu Mar 31 12:17:37 2011	(r220191)
@@ -818,10 +818,10 @@ restart:
 			} else
 				update = 0;
 			if (update) {
+				updated = 1;
 				g_raid_md_write_promise(md, vol, NULL, disk);
 				break;
 			}
-			updated += update;
 		}
 	}
 	if (updated)