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

[Alexander Motin]

Author: mav
Date: Sun Feb 13 08:54:47 2011
New Revision: 218632
URL: http://svn.freebsd.org/changeset/base/218632

Log:
  Plug BIO leaks during error recovery.

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	Sun Feb 13 06:19:38 2011	(r218631)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Sun Feb 13 08:54:47 2011	(r218632)
@@ -843,6 +843,7 @@ rebuild_round_done:
 		*mask |= 1 << sd->sd_pos;
 		nsd = g_raid_tr_raid1_select_read_disk(vol, pbp, *mask);
 		if (nsd != NULL && (cbp = g_clone_bio(pbp)) != NULL) {
+			g_destroy_bio(bp);
 			G_RAID_LOGREQ(2, cbp, "Retrying read from %d",
 			    nsd->sd_pos);
 			if (pbp->bio_children == 2 && do_write) {
@@ -883,6 +884,7 @@ rebuild_round_done:
 		G_RAID_LOGREQ(3, bp, "Recovered data from other drive");
 		cbp = g_clone_bio(pbp);
 		if (cbp != NULL) {
+			g_destroy_bio(bp);
 			cbp->bio_cmd = BIO_WRITE;
 			cbp->bio_cflags = G_RAID_BIO_FLAG_REMAP;
 			G_RAID_LOGREQ(2, cbp,