Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Sep 2016 18:06:43 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r306373 - stable/11/sys/geom/mirror
Message-ID:  <201609271806.u8RI6hik023937@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Tue Sep 27 18:06:43 2016
New Revision: 306373
URL: https://svnweb.freebsd.org/changeset/base/306373

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

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

Modified: stable/11/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/11/sys/geom/mirror/g_mirror.c	Tue Sep 27 18:05:24 2016	(r306372)
+++ stable/11/sys/geom/mirror/g_mirror.c	Tue Sep 27 18:06:43 2016	(r306373)
@@ -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));



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609271806.u8RI6hik023937>