svn commit: r218624 - projects/graid/head/sys/geom/raid

[Alexander Motin]

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;