From owner-svn-src-projects@FreeBSD.ORG  Sat Feb 12 21:30:09 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 2CA55106564A;
	Sat, 12 Feb 2011 21:30:09 +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 15BA78FC12;
	Sat, 12 Feb 2011 21:30:09 +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 p1CLU8o6015535;
	Sat, 12 Feb 2011 21:30:08 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1CLU8xx015533;
	Sat, 12 Feb 2011 21:30:08 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102122130.p1CLU8xx015533@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 12 Feb 2011 21:30:08 +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: r218624 - 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: Sat, 12 Feb 2011 21:30:09 -0000

Author: mav
Date: Sat Feb 12 21:30:08 2011
New Revision: 218624
URL: http://svn.freebsd.org/changeset/base/218624

Log:
  Transpose logical expression to make it more readable.
  Fix minor off by one mistake in it.

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	Sat Feb 12 21:17:38 2011	(r218623)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Sat Feb 12 21:30:08 2011	(r218624)
@@ -504,10 +504,9 @@ g_raid_tr_raid1_select_read_disk(struct 
 	for (i = 0; i < vol->v_disks_count; i++) {
 		sd = &vol->v_subdisks[i];
 		if (sd->sd_state != G_RAID_SUBDISK_S_ACTIVE &&
-		    !((sd->sd_state == G_RAID_SUBDISK_S_REBUILD ||
-		       sd->sd_state == G_RAID_SUBDISK_S_RESYNC) && 
-		      bp->bio_offset + bp->bio_length <
-		       sd->sd_rebuild_pos))
+		    ((sd->sd_state != G_RAID_SUBDISK_S_REBUILD &&
+		      sd->sd_state != G_RAID_SUBDISK_S_RESYNC) ||
+		     bp->bio_offset + bp->bio_length > sd->sd_rebuild_pos))
 			continue;
 		if ((mask & (1 << i)) != 0)
 			continue;