From e1efe7edcdbe4ee04087ade6523025c9ea588ff3 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Wed, 4 Aug 2004 10:02:06 +0000 Subject: [PATCH] MFp4: We don't really need g_mirror_free_disk() function. --- sys/geom/mirror/g_mirror.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index ecb1a855104..e4540ab3e8d 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -398,19 +398,6 @@ fail: return (NULL); } -/* - * Free the disk. - */ -static void -g_mirror_free_disk(struct g_mirror_disk *disk) -{ - - g_topology_assert(); - - g_mirror_disconnect_disk(disk); - free(disk, M_MIRROR); -} - static void g_mirror_destroy_disk(struct g_mirror_disk *disk) { @@ -430,7 +417,8 @@ g_mirror_destroy_disk(struct g_mirror_disk *disk) case G_MIRROR_DISK_STATE_NEW: case G_MIRROR_DISK_STATE_STALE: case G_MIRROR_DISK_STATE_ACTIVE: - g_mirror_free_disk(disk); + g_mirror_disconnect_disk(disk); + free(disk, M_MIRROR); break; default: KASSERT(0 == 1, ("Wrong disk state (%s, %s).",