From 71f3313e4975419065fd53a1c4cb6a135a94a686 Mon Sep 17 00:00:00 2001 From: markj Date: Tue, 27 Sep 2016 18:06:43 +0000 Subject: MFC r305509: Don't treat an error from g_mirror_clear_metadata() as fatal. --- sys/geom/mirror/g_mirror.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 1228079..e315f51 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -2663,8 +2663,12 @@ again: int error; error = g_mirror_clear_metadata(disk); - if (error != 0) - return (error); + if (error != 0) { + G_MIRROR_DEBUG(0, + "Device %s: failed to clear metadata on %s: %d.", + sc->sc_name, g_mirror_get_diskname(disk), error); + break; + } DISK_STATE_CHANGED(); G_MIRROR_DEBUG(0, "Device %s: provider %s destroyed.", sc->sc_name, g_mirror_get_diskname(disk)); -- cgit v1.1