svn commit: r251922 - in stable/9/sys/geom: gate nop raid

[Alexander Motin]

Author: mav
Date: Tue Jun 18 09:34:36 2013
New Revision: 251922
URL: http://svnweb.freebsd.org/changeset/base/251922

Log:
  MFC r248720:
  Remove extra bio_data and bio_length copying to child request after calling
  g_clone_bio(), that already copied them.

Modified:
  stable/9/sys/geom/gate/g_gate.c
  stable/9/sys/geom/nop/g_nop.c
  stable/9/sys/geom/raid/tr_raid1e.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/gate/g_gate.c
==============================================================================
--- stable/9/sys/geom/gate/g_gate.c	Tue Jun 18 09:31:06 2013	(r251921)
+++ stable/9/sys/geom/gate/g_gate.c	Tue Jun 18 09:34:36 2013	(r251922)
@@ -245,8 +245,6 @@ g_gate_start(struct bio *pbp)
 			}
 			cbp->bio_done = g_gate_done;
 			cbp->bio_offset = pbp->bio_offset + sc->sc_readoffset;
-			cbp->bio_data = pbp->bio_data;
-			cbp->bio_length = pbp->bio_length;
 			cbp->bio_to = sc->sc_readcons->provider;
 			g_io_request(cbp, sc->sc_readcons);
 			return;

Modified: stable/9/sys/geom/nop/g_nop.c
==============================================================================
--- stable/9/sys/geom/nop/g_nop.c	Tue Jun 18 09:31:06 2013	(r251921)
+++ stable/9/sys/geom/nop/g_nop.c	Tue Jun 18 09:34:36 2013	(r251922)
@@ -112,8 +112,6 @@ g_nop_start(struct bio *bp)
 	}
 	cbp->bio_done = g_std_done;
 	cbp->bio_offset = bp->bio_offset + sc->sc_offset;
-	cbp->bio_data = bp->bio_data;
-	cbp->bio_length = bp->bio_length;
 	pp = LIST_FIRST(&gp->provider);
 	KASSERT(pp != NULL, ("NULL pp"));
 	cbp->bio_to = pp;

Modified: stable/9/sys/geom/raid/tr_raid1e.c
==============================================================================
--- stable/9/sys/geom/raid/tr_raid1e.c	Tue Jun 18 09:31:06 2013	(r251921)
+++ stable/9/sys/geom/raid/tr_raid1e.c	Tue Jun 18 09:34:36 2013	(r251922)
@@ -1076,8 +1076,6 @@ rebuild_round_done:
 				offset += vol->v_strip_size;
 			}
 			cbp->bio_offset = offset + start;
-			cbp->bio_length = bp->bio_length;
-			cbp->bio_data = bp->bio_data;
 			cbp->bio_cmd = BIO_WRITE;
 			cbp->bio_cflags = G_RAID_BIO_FLAG_REMAP;
 			cbp->bio_caller2 = (void *)mask;