From 1686ac18f9b92526adbc9d650cdc9080aa4e30a1 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Thu, 30 Jan 2003 19:43:50 +0000
Subject: [PATCH] NO_GEOM cleanup: retire disk_invalidate()

---
 sys/cam/scsi/scsi_da.c | 1 -
 sys/dev/ata/ata-disk.c | 1 -
 sys/dev/ata/ata-raid.c | 1 -
 sys/dev/ata/atapi-fd.c | 1 -
 sys/geom/geom_disk.c   | 5 -----
 sys/sys/disk.h         | 1 -
 6 files changed, 10 deletions(-)

diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index df68134ca97b..fc22fafdcd6c 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -567,7 +567,6 @@ daopen(dev_t dev, int flags __unused, int fmt __unused, struct thread *td __unus
 
 	if ((softc->flags & DA_FLAG_PACK_INVALID) != 0) {
 		/* Invalidate our pack information. */
-		disk_invalidate(&softc->disk);
 		softc->flags &= ~DA_FLAG_PACK_INVALID;
 	}
 	splx(s);
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index af172f01319e..49f20624a9e9 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -254,7 +254,6 @@ ad_detach(struct ata_device *atadev, int flush) /* get rid of flush XXX SOS */
 	bioq_remove(&adp->queue, bp); 
 	biofinish(bp, NULL, ENXIO);
     }
-    disk_invalidate(&adp->disk);
     disk_destroy(adp->dev);
     devstat_remove_entry(&adp->stats);
     if (flush) {
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index 62f5a9d9ccbf..6dae4322de78 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -406,7 +406,6 @@ ata_raid_delete(int array)
 	ar_promise_write_conf(rdp);
     else
 	ar_highpoint_write_conf(rdp);
-    disk_invalidate(&rdp->disk);
     disk_destroy(rdp->dev);
     free(rdp, M_AR);
     ar_table[array] = NULL;
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 2bdbe9dddc62..5d6f66ae81f9 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -125,7 +125,6 @@ afddetach(struct ata_device *atadev)
 	bioq_remove(&fdp->queue, bp);
 	biofinish(bp, NULL, ENXIO);
     }
-    disk_invalidate(&fdp->disk);
     disk_destroy(fdp->dev);
     devstat_remove_entry(&fdp->stats);
     ata_free_name(atadev);
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 8b377a268995..f337b3793886 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -294,11 +294,6 @@ disk_destroy(dev_t dev)
 	g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO);
 }
 
-void
-disk_invalidate (struct disk *disk)
-{
-}
-
 static void
 g_kern_disks(void *p)
 {
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 420d9ba2d801..29803ab5f661 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -43,7 +43,6 @@ dev_t disk_create(int unit, struct disk *disk, int flags, struct cdevsw *cdevsw,
 void disk_destroy(dev_t dev);
 struct disk *disk_enumerate(struct disk *disk);
 void disk_err(struct bio *bp, const char *what, int blkdone, int nl);
-void disk_invalidate(struct disk *disk);
 
 #endif