diff options
| author | phk <phk@FreeBSD.org> | 2003-03-08 08:01:31 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-03-08 08:01:31 +0000 |
| commit | e01fc931cfd9bda87619e5079027111673291cd0 (patch) | |
| tree | 040efa2f46ce483cf5b045724c67c81b1d43d147 /sys/dev/twe | |
| parent | a7246ed45b4e70820cc609b9abd0dc340fd24782 (diff) | |
| download | FreeBSD-src-e01fc931cfd9bda87619e5079027111673291cd0.zip FreeBSD-src-e01fc931cfd9bda87619e5079027111673291cd0.tar.gz | |
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.
Diffstat (limited to 'sys/dev/twe')
| -rw-r--r-- | sys/dev/twe/twe_compat.h | 4 | ||||
| -rw-r--r-- | sys/dev/twe/twe_freebsd.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h index 3d10434..7d2f9c7 100644 --- a/sys/dev/twe/twe_compat.h +++ b/sys/dev/twe/twe_compat.h @@ -171,8 +171,8 @@ typedef struct bio_queue_head twe_bioq; # define TWE_BIO_HAS_ERROR(bp) ((bp)->bio_flags & BIO_ERROR) # define TWE_BIO_RESID(bp) (bp)->bio_resid # define TWE_BIO_DONE(bp) biodone(bp) -# define TWE_BIO_STATS_START(bp) devstat_start_transaction(&((struct twed_softc *)TWE_BIO_SOFTC(bp))->twed_stats) -# define TWE_BIO_STATS_END(bp) devstat_end_transaction_bio(&((struct twed_softc *)TWE_BIO_SOFTC(bp))->twed_stats, bp) +# define TWE_BIO_STATS_START(bp) +# define TWE_BIO_STATS_END(bp) #endif #endif /* FreeBSD */ diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index a0b6db7..10d7006 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -44,8 +44,6 @@ #include <dev/twe/twevar.h> #include <dev/twe/twe_tables.h> -#include <sys/devicestat.h> - static devclass_t twe_devclass; #ifdef TWE_DEBUG @@ -539,7 +537,6 @@ struct twed_softc struct twe_softc *twed_controller; /* parent device softc */ struct twe_drive *twed_drive; /* drive data in parent softc */ struct disk twed_disk; /* generic disk handle */ - struct devstat twed_stats; /* accounting */ }; /* @@ -705,11 +702,6 @@ twed_attach(device_t dev) sc->twed_drive->td_size / ((1024 * 1024) / TWE_BLOCK_SIZE), sc->twed_drive->td_size); - devstat_add_entry(&sc->twed_stats, "twed", device_get_unit(dev), TWE_BLOCK_SIZE, - DEVSTAT_NO_ORDERED_TAGS, - DEVSTAT_TYPE_STORARRAY | DEVSTAT_TYPE_IF_OTHER, - DEVSTAT_PRIORITY_ARRAY); - /* attach a generic disk device to ourselves */ sc->twed_disk.d_open = twed_open; @@ -746,7 +738,6 @@ twed_detach(device_t dev) if (sc->twed_disk.d_flags & DISKFLAG_OPEN) return(EBUSY); - devstat_remove_entry(&sc->twed_stats); #ifdef FREEBSD_4 if (--disks_registered == 0) cdevsw_remove(&tweddisk_cdevsw); |
