svn commit: r306374 - stable/10/sys/geom/mirror

[Mark Johnston]

Author: markj
Date: Tue Sep 27 18:07:22 2016
New Revision: 306374
URL: https://svnweb.freebsd.org/changeset/base/306374

Log:
  MFC r305509:
  Don't treat an error from g_mirror_clear_metadata() as fatal.

Modified:
  stable/10/sys/geom/mirror/g_mirror.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/10/sys/geom/mirror/g_mirror.c	Tue Sep 27 18:06:43 2016	(r306373)
+++ stable/10/sys/geom/mirror/g_mirror.c	Tue Sep 27 18:07:22 2016	(r306374)
@@ -2669,8 +2669,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));