Centralize the devstat handling for all GEOM disk device drivers

in geom_disk.c.

As a side effect this makes a lot of #include <sys/devicestat.h>
lines not needed and some biofinish() calls can be reduced to
biodone() again.

1 files changed, 1 insertions, 9 deletions

diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 62949b5..c1ee68b 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -19,7 +19,6 @@
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
-#include <sys/devicestat.h>
 #include <sys/module.h>
 #include <machine/resource.h>
 
@@ -80,7 +79,6 @@ static struct fla_s {
 	unsigned nsect;
 	struct doc2k_stat ds;
 	struct bio_queue_head bio_queue;
-	struct devstat stats;
 	struct disk disk;
 	dev_t dev;
 } softc[8];
@@ -151,7 +149,6 @@ flastrategy(struct bio *bp)
 		if (!bp)
 			break;
 
-		devstat_start_transaction(&sc->stats);
 		bp->bio_resid = bp->bio_bcount;
 		unit = sc->unit;
 
@@ -181,7 +178,7 @@ flastrategy(struct bio *bp)
 		} else {
 			bp->bio_resid = 0;
 		}
-		biofinish(bp, &sc->stats, 0);
+		biodone(bp);
 
 	}
 	sc->busy = 0;
@@ -259,11 +256,6 @@ flaattach (device_t dev)
 
 	bioq_init(&sc->bio_queue);
 
-	devstat_add_entry(&softc[unit].stats, "fla", unit, DEV_BSIZE,
-		DEVSTAT_NO_ORDERED_TAGS, 
-		DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_OTHER,
-		DEVSTAT_PRIORITY_DISK);
-
 	sc->disk.d_open = flaopen;
 	sc->disk.d_close = flaclose;
 	sc->disk.d_strategy = flastrategy;