diff options
| -rw-r--r-- | sys/kern/subr_disk.c | 46 | ||||
| -rw-r--r-- | sys/sys/disk.h | 4 |
2 files changed, 2 insertions, 48 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index e0a01cce326..69d177b446a 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.37 2007/05/04 23:21:23 deraadt Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.38 2007/05/05 12:43:35 art Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -243,25 +243,6 @@ disk_init(void) disk_count = disk_change = 0; } -/* - * Searches the disklist for the disk corresponding to the - * name provided. - */ -struct disk * -disk_find(char *name) -{ - struct disk *diskp; - - if ((name == NULL) || (disk_count <= 0)) - return (NULL); - - TAILQ_FOREACH(diskp, &disklist, dk_link) - if (strcmp(diskp->dk_name, name) == 0) - return (diskp); - - return (NULL); -} - int disk_construct(struct disk *diskp, char *lockname) { @@ -396,31 +377,6 @@ disk_unlock(struct disk *dk) rw_exit(&dk->dk_lock); } -/* - * Reset the metrics counters on the given disk. Note that we cannot - * reset the busy counter, as it may case a panic in disk_unbusy(). - * We also must avoid playing with the timestamp information, as it - * may skew any pending transfer results. - */ -void -disk_resetstat(struct disk *diskp) -{ - int s = splbio(); - - diskp->dk_rxfer = 0; - diskp->dk_rbytes = 0; - diskp->dk_wxfer = 0; - diskp->dk_wbytes = 0; - diskp->dk_seek = 0; - - microuptime(&diskp->dk_attachtime); - - timerclear(&diskp->dk_time); - - splx(s); -} - - int dk_mountroot(void) { diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 11846ee90ed..569ea650430 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.h,v 1.14 2007/03/30 00:38:56 dlg Exp $ */ +/* $OpenBSD: disk.h,v 1.15 2007/05/05 12:43:35 art Exp $ */ /* $NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $ */ /* @@ -162,8 +162,6 @@ void disk_attach(struct disk *); void disk_detach(struct disk *); void disk_busy(struct disk *); void disk_unbusy(struct disk *, long, int); -void disk_resetstat(struct disk *); -struct disk *disk_find(char *); int disk_lock(struct disk *); void disk_unlock(struct disk *); |