Rename bio_linkage to the more obvious bio_parent.

Add bio_t0 timestamp, and include <sys/time.h> where needed

3 files changed, 3 insertions, 3 deletions

diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 36634e2..99f4cc7 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -363,7 +363,7 @@ g_dev_done(struct bio *bp2)
 {
 	struct bio *bp;
 
-	bp = bp2->bio_linkage;
+	bp = bp2->bio_parent;
 	bp->bio_error = bp2->bio_error;
 	if (bp->bio_error != 0) {
 		g_trace(G_T_BIO, "g_dev_done(%p) had error %d",
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index 514703b..9a6d215 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -148,7 +148,7 @@ g_clone_bio(struct bio *bp)
 
 	bp2 = g_new_bio();
 	if (bp2 != NULL) {
-		bp2->bio_linkage = bp;
+		bp2->bio_parent = bp;
 		bp2->bio_cmd = bp->bio_cmd;
 		bp2->bio_length = bp->bio_length;
 		bp2->bio_offset = bp->bio_offset;
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index 7c1c4c1..0d28978 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -494,7 +494,7 @@ g_std_done(struct bio *bp)
 {
 	struct bio *bp2;
 
-	bp2 = bp->bio_linkage;
+	bp2 = bp->bio_parent;
 	if (bp2->bio_error == 0)
 		bp2->bio_error = bp->bio_error;
 	bp2->bio_completed += bp->bio_completed;