PERFORCE change 122234 for review

[Ulf Lilleengen]

http://perforce.freebsd.org/chv.cgi?CH=122234

Change 122234 by lulf at lulf_carrot on 2007/06/24 17:45:27

	- Fix a bug where using state instead of flags.
	- Fix a bug where parity bio_data is not copied into the parity BIO.

Affected files ...

.. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#9 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#19 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#6 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#4 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#12 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#8 edit

Differences ...

==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#9 (text+ko) ====


==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#19 (text+ko) ====


==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#6 (text+ko) ====

@@ -445,6 +445,7 @@
 			cbp = gv_raid5_clone_bio(bp, parity, wp, NULL, 1);
 			if (cbp == NULL)
 				return (ENOMEM);
+			bcopy(addr, cbp->bio_data, wp->length);
 			wp->parity = cbp;
 
 		/*

==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#4 (text+ko) ====


==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#12 (text+ko) ====


==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#8 (text+ko) ====

@@ -101,7 +101,7 @@
 	case BIO_DELETE:
 		/* Delay write-requests if any plex is synchronizing. */
 		LIST_FOREACH(p, &v->plexes, in_volume) {
-			if (p->state == GV_PLEX_SYNCING) {
+			if (p->flags & GV_PLEX_SYNCING) {
 				bioq_insert_tail(v->wqueue, bp);
 				return;
 			}